新增首页相关统计接口

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsConsoleController.java

@@ -1,9 +1,7 @@
 package com.yunfeiyun.agmp.fms.controller;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.github.pagehelper.PageHelper;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
@@ -16,10 +14,10 @@ import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.*;
-import com.yunfeiyun.agmp.fms.domain.reqvo.*;
+import com.yunfeiyun.agmp.fms.domain.reqvo.FmsPlanReqVo;
+import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
+import com.yunfeiyun.agmp.fms.domain.reqvo.ScreenDataReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsSolarVo;
-import com.yunfeiyun.agmp.fms.mapper.FmsCropMapper;
 import com.yunfeiyun.agmp.fms.service.*;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.slf4j.Logger;
@@ -33,13 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
-import java.time.temporal.WeekFields;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -134,7 +125,7 @@ public class FmsConsoleController extends BaseController {
         appendBlockStat(fmsConsoleStatResVo,blockIds);
         // 拼装种植统计数据
         appendPlanStat(fmsConsoleStatResVo,blockIds);
-        return AjaxResult.success();
+        return AjaxResult.success(fmsConsoleStatResVo);
     }
 
     @PreAuthorize("@ss.hasPermi('fms:console:console:data')")
@@ -150,9 +141,10 @@ public class FmsConsoleController extends BaseController {
         }else {
             blockIds = null;
         }
-        List<FmsCropPlanAreaResVo> fmsCropPlanAreaResVos = fmsPlanService.selectCropPlanAreaTop(blockIds);
+        startPage();
+        List<FmsCropPlanAreaResVo> fmsCropPlanAreaResVos = fmsPlanService.selectCropPlanAreaTop(blockIds,SecurityUtils.getTid());
         List<String> cropIds = fmsCropPlanAreaResVos.stream().map(FmsCropPlanAreaResVo::getCropId).collect(Collectors.toList());
-        List<FmsCrop> fmsCropList = fmsCropService.selectFmsCropListByCropIds(cropIds);
+        List<FmsCrop> fmsCropList = fmsCropService.selectFmsCropListByCropIds(cropIds,SecurityUtils.getTid());
         Map<String,FmsCrop> cropMap = fmsCropList.stream().collect(Collectors.toMap(FmsCrop::getCropId,item->item));
         for(FmsCropPlanAreaResVo fmsCropPlanAreaResVo : fmsCropPlanAreaResVos){
             FmsCrop fmsCrop = cropMap.get(fmsCropPlanAreaResVo.getCropId());
@@ -198,45 +190,105 @@ public class FmsConsoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('fms:console:task:stat')")
     @GetMapping(value = "/task/stat")
-    public AjaxResult selectTaskStat() {
-        FmsTaskListReqVo reqVo = new FmsTaskListReqVo();
-//        reqVo.setTaskAuditstatus(TaskStatus.COMPLETED.getCode());
-//        reqVo.setTaskAudittype(CommonEnums.TASK_AUDIT_TYPE_DOWN.getCode() + "," + CommonEnums.TASK_AUDIT_TYPE_UP.getCode());
-        reqVo.setStartDate(LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN).format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        reqVo.setEndDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        List<FmsTaskTypeCountResVo> typeCounts = fmsTaskService.selectCountFmsTaskByType(reqVo);
-
-        //待执行
-//        reqVo.setTaskAuditstatus(TaskStatus.EXECUTING.getCode() + "," + TaskStatus.UNAUDITED.getCode());
-//        int count1 = fmsTaskService.selectCountFmsTask(reqVo);
-
-        reqVo.setTaskAuditstatus(TaskStatus.COMPLETED.getCode());
-        reqVo.setStartDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        int count1 = fmsTaskService.selectCountFmsTask(reqVo);
-
-        reqVo.setTaskAuditstatus(TaskStatus.COMPLETED.getCode());
-        reqVo.setStartDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).with(DayOfWeek.MONDAY).format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        int count2 = fmsTaskService.selectCountFmsTask(reqVo);
-
-        reqVo.setStartDate(LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN).format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        int count3 = fmsTaskService.selectCountFmsTask(reqVo);
-
-        reqVo.setStartDate(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear()).with(LocalTime.MIN).format(DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode())));
-        int count4 = fmsTaskService.selectCountFmsTask(reqVo);
-
-        Map<String, Object> statMap = new HashMap<>();
-        statMap.put("count1", count1);
-        statMap.put("count2", count2);
-        statMap.put("count3", count3);
-        statMap.put("count4", count4);
-
-        Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("typeCounts", typeCounts);
-        resultMap.put("statMap", statMap);
-
-        return AjaxResult.success(resultMap);
+    public AjaxResult selectTaskStat(){
+        Map<String,Object> result = new HashMap<>();
+        List<String> blockIds = null;
+        if (SecurityUtils.isValidate()) {
+            blockIds = dataAuthUtil.blockList();
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MONTH,0);
+        calendar.set(Calendar.DAY_OF_MONTH,1);
+        // 今年开始时间
+        String yearStartDate = DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_00_00_00);
+        calendar.add(Calendar.YEAR,1);
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        // 今年结束时间
+        String yearEndDate = DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_23_59_59);
+        FmsTaskListReqVo fmsTaskQuery = new FmsTaskListReqVo();
+        fmsTaskQuery.setBlockIds(blockIds);
+        fmsTaskQuery.setStartDate(yearStartDate);
+        fmsTaskQuery.setEndDate(yearEndDate);
+        // 查询出今年所有农事任务
+        List<FmsTask> yearTaskList = fmsTaskService.selectFmsTaskList(fmsTaskQuery);
+        Date[] monthDate = getMonthDate();
+        Date[] weekDate = getWeekDate();
+        Map<String,JSONObject> weekTaskMap = new HashMap<>();
+        Map<String,JSONObject> monthTaskMap = new HashMap<>();
+        Map<String,JSONObject> yearTaskMap = new HashMap<>();
+        int completeTaskNum = 0;
+        int executingTaskNum = 0;
+        for(FmsTask fmsTask : yearTaskList){
+            Date date = DateUtils.parseDate(fmsTask.getTaskPlanstartdate());
+            if(DateUtils.isBetween(date,weekDate[0],weekDate[1])){
+                // 属于当前周
+                addTaskTypeNum(weekTaskMap,fmsTask);
+            }
+            if(DateUtils.isBetween(date,monthDate[0],monthDate[1])){
+                // 属于当前月
+                addTaskTypeNum(monthTaskMap,fmsTask);
+            }
+            // 属于当前年
+            addTaskTypeNum(yearTaskMap,fmsTask);
+            if(TaskStatus.COMPLETED.equal(fmsTask.getTaskStatus())){
+                completeTaskNum++;
+            }else if(!TaskStatus.STOP.equal(fmsTask.getTaskStatus())){
+                executingTaskNum++;
+            }
+        }
+        result.put("executingTaskNum",executingTaskNum);
+        result.put("completeTaskNum",completeTaskNum);
+        result.put("weekTaskStat",weekTaskMap.values());
+        result.put("monthTaskStat",monthTaskMap.values());
+        result.put("yearTaskStat",yearTaskMap.values());
+        return AjaxResult.success(result);
+    }
+    private Date[] getMonthDate(){
+        Calendar calendar = Calendar.getInstance();
+        // 初始化当前时间
+        calendar.setTime(new Date());
+        // 设置当前时间是当月第一天
+        calendar.set(Calendar.DAY_OF_MONTH,1);
+        // 当前月开始时间
+        Date monthStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_00_00_00));
+        // 月份加1
+        calendar.add(Calendar.MONTH,1);
+        // 当前时间减1天
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        // 当前月结束时间
+        Date monthEndDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_23_59_59));
+        return new Date[]{monthStartDate,monthEndDate};
+    }
+    private Date[] getWeekDate(){
+        Calendar calendar = Calendar.getInstance();
+        // 初始化当前时间
+        calendar.setTime(new Date());
+        // 设置每周的第一天是以周一开始
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        // 设置当前时间是周一
+        calendar.set(Calendar.DAY_OF_WEEK,Calendar.MONDAY);
+        // 获取当前周开始时间
+        Date weekStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_00_00_00));
+        // 周序加1
+        calendar.add(Calendar.WEEK_OF_MONTH,1);
+        // 当前时间减1天
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        // 获取当前周结束时间
+        Date weekEndDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.formatDate(calendar.getTime(),DateUtils.YYYY_MM_DD_23_59_59));
+        return new Date[]{weekStartDate,weekEndDate};
+    }
+    // 统计任务种类数量
+    private void addTaskTypeNum(Map<String,JSONObject> map, FmsTask fmsTask){
+        JSONObject jsonObject = map.get(fmsTask.getTaskType());
+        if(null == jsonObject){
+            jsonObject = new JSONObject();
+            map.put(fmsTask.getTaskType(),jsonObject);
+            jsonObject.put("value", 1);
+            jsonObject.put("name",fmsTask.getTaskTypeContent());
+        }else {
+            jsonObject.put("value",jsonObject.getIntValue("value")+1);
+        }
     }
-
 
     /**
      * 获取农事任务统计信息
@@ -249,9 +301,7 @@ public class FmsConsoleController extends BaseController {
         fmsMessageResVoMap.put(FmsMessageResVoType.TASK.getType(),new FmsMessageResVo(FmsMessageResVoType.TASK));
         fmsMessageResVoMap.put(FmsMessageResVoType.CHANGE.getType(),new FmsMessageResVo(FmsMessageResVoType.CHANGE));
         fmsMessageResVoMap.put(FmsMessageResVoType.PICK.getType(),new FmsMessageResVo(FmsMessageResVoType.PICK));
-        //  fmsTaskService.appendTaskMessage(fmsMessageResVoMap);
         fmsWarnService.appendWarnMessage(fmsMessageResVoMap);
-        // wmsChangeapplyService.appendChangeMessage(fmsMessageResVoMap);
         return AjaxResult.success(new ArrayList<>(fmsMessageResVoMap.values()));
     }
 

src/main/java/com/yunfeiyun/agmp/fms/domain/reqvo/FmsTaskListReqVo.java

@@ -1,7 +1,7 @@
 package com.yunfeiyun.agmp.fms.domain.reqvo;
 
 
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
+import com.yunfeiyun.agmp.fms.domain.FmsTask;
 import lombok.Data;
 
 /**
@@ -11,45 +11,18 @@ import lombok.Data;
  * @date 2023-05-19
  */
 @Data
-public class FmsTaskListReqVo extends BaseEntity
+public class FmsTaskListReqVo extends FmsTask
 {
     private static final long serialVersionUID = 1L;
 
-    /** 任务编号 */
-    private String taskNo;
-
-    /** 计划标识 */
-    private String planId;
-
     /**
      * 计划编号
      * */
     private String planNo;
 
-    /** 地块标识 */
-    private String blockId;
-
-    /** 基地标识 */
-    private String landId;
-
-    /** 作物标识 */
-    private String cropId;
-
-    /** 农事任务创建类型 */
-    private String taskCreatetype;
-
-    /** 农事任务类型 */
-    private String taskType;
-
     /** 农事任务状态 */
     private String taskAuditstatus;
 
-    /** 农事任务申请类型 */
-    private String taskAudittype;
-
-    /** 农事任务管理者 */
-    private String taskManager;
-
     /** 农事任务管理者名字 */
     private String taskManagername;
 
@@ -62,9 +35,6 @@ public class FmsTaskListReqVo extends BaseEntity
     /** 作物名称 */
     private String cropName;
 
-    /** 任务审核人 */
-    private String taskAuditor;
-
     private boolean queryAllTask = false;
     
     private String tid;

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsCropMapper.java

@@ -2,7 +2,6 @@ package com.yunfeiyun.agmp.fms.mapper;
 
 import com.yunfeiyun.agmp.fms.domain.FmsCrop;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsBlockCropDto;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsBlockResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsCropResVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -74,5 +73,5 @@ public interface FmsCropMapper
      */
     public int deleteFmsCropByCropIds(@Param("array") String[] cropIds, @Param("tid") String tid);
 
-    List<FmsCrop> selectFmsCropListByCropIds(@Param("cropIds") List<String> cropIds);
+    List<FmsCrop> selectFmsCropListByCropIds(@Param("cropIds") List<String> cropIds, @Param("tid") String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsPlanMapper.java

@@ -113,5 +113,5 @@ public interface FmsPlanMapper
 
     List<String> selectBlockManagerByPlanId(@Param("planId") String planId, @Param("tid") String tid);
 
-    List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(@Param("blockIds") List<String> blockIds);
+    List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(@Param("blockIds") List<String> blockIds, @Param("tid") String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsTaskMapper.java

@@ -51,15 +51,12 @@ public interface FmsTaskMapper
      */
     public List<FmsTaskResVo> getInfoByPlanId(@Param("planId") String planId, @Param("tid") String tid);
 
-    /**
-     * 查询农事任务列表
-     * 
-     * @param fmsTask 农事任务
-     * @return 农事任务集合
-     */
-    public List<FmsTask> selectFmsTaskList(FmsTask fmsTask);
+
 
     public List<FmsTaskResVo> selectTaskList(FmsTaskListReqVo reqVo);
+
+    public List<FmsTask> selectFmsTaskList(FmsTaskListReqVo reqVo);
+
     public List<FmsTaskResVo> selectTaskListAll(FmsTaskListReqVo reqVo);
 
     public List<FmsTaskResVo> selectTaskListScreenData(FmsTaskListReqVo reqVo);

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsCropService.java

@@ -69,5 +69,5 @@ public interface IFmsCropService
      */
     public int deleteFmsCropByCropId(String cropId, String tid);
 
-    List<FmsCrop> selectFmsCropListByCropIds(List<String> cropIds);
+    List<FmsCrop> selectFmsCropListByCropIds(List<String> cropIds, String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsPlanService.java

@@ -113,5 +113,5 @@ public interface IFmsPlanService
      */
     public List<FmsPlanByWarnSchedulerDto> selectPlanListByWarnScheduler(String planEnddate, String tid);
 
-    List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(List<String> blockIds);
+    List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(List<String> blockIds, String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsTaskService.java

@@ -54,7 +54,8 @@ public interface IFmsTaskService
      * @param fmsTask 农事任务
      * @return 农事任务集合
      */
-    public List<FmsTask> selectFmsTaskList(FmsTask fmsTask);
+    public List<FmsTask> selectFmsTaskList(FmsTaskListReqVo fmsTaskListReqVo);
+
 
     public List<FmsTaskResVo> selectTaskList(FmsTaskListReqVo reqVo);
 

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsCropServiceImpl.java

@@ -7,10 +7,9 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.fms.domain.FmsCrop;
-import com.yunfeiyun.agmp.fms.mapper.FmsCropMapper;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsCropResVo;
+import com.yunfeiyun.agmp.fms.mapper.FmsCropMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsCropService;
-import org.apache.catalina.security.SecurityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -168,8 +166,8 @@ public class FmsCropServiceImpl implements IFmsCropService
     }
 
     @Override
-    public List<FmsCrop> selectFmsCropListByCropIds(List<String> cropIds) {
-        return fmsCropMapper.selectFmsCropListByCropIds(cropIds);
+    public List<FmsCrop> selectFmsCropListByCropIds(List<String> cropIds,String tid) {
+        return fmsCropMapper.selectFmsCropListByCropIds(cropIds,tid);
     }
 
 

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsPlanServiceImpl.java

@@ -139,7 +139,6 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
 
     @Override
     public List<FmsPlan> selectPlanListScheduler(FmsPlanReqVo reqVo) {
-        reqVo.setTid(SecurityUtils.getTid());
         return fmsPlanMapper.selectPlanListScheduler(reqVo);
     }
 
@@ -432,8 +431,8 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
     }
 
     @Override
-    public List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(List<String> blockIds) {
-        return fmsPlanMapper.selectCropPlanAreaTop(blockIds);
+    public List<FmsCropPlanAreaResVo> selectCropPlanAreaTop(List<String> blockIds,String tid) {
+        return fmsPlanMapper.selectCropPlanAreaTop(blockIds,tid);
     }
 
     private String dateStrAdd(String data,Integer days){

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskServiceImpl.java

@@ -146,9 +146,9 @@ public class FmsTaskServiceImpl implements IFmsTaskService
      * @return 农事任务
      */
     @Override
-    public List<FmsTask> selectFmsTaskList(FmsTask fmsTask) {
-        fmsTask.setTid(SecurityUtils.getTid());
-        return fmsTaskMapper.selectFmsTaskList(fmsTask);
+    public List<FmsTask> selectFmsTaskList(FmsTaskListReqVo fmsTaskListReqVo) {
+        fmsTaskListReqVo.setTid(SecurityUtils.getTid());
+        return fmsTaskMapper.selectFmsTaskList(fmsTaskListReqVo);
     }
 
     @Override

src/main/resources/mapper/FmsCropMapper.xml

@@ -135,9 +135,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFmsCropListByCropIds" resultType="com.yunfeiyun.agmp.fms.domain.FmsCrop">
         <include refid="selectFmsCropVo"/>
         <where>
+            tid = #{tid}
             <if test="cropIds != null and cropIds.size() != 0">
-                cropId in
-                <foreach collection="cropIds" item="item" open="(" close=")" separator=",">
+                and cropId in
+                <foreach collection="cropIds" item="item" open="("  separator="," close=")">
                     #{item}
                 </foreach>
             </if>

src/main/resources/mapper/FmsPlanMapper.xml

@@ -499,6 +499,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         FmsPlan
         <where>
+            tid = #{tid}
             <if test="blockIds != null and blockIds.size() != 0">
                 and blockId in
                 <foreach collection="blockIds" item="item" index="index" open="(" separator="," close=")">

src/main/resources/mapper/FmsTaskMapper.xml

@@ -29,6 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskCompletedate != null  and taskCompletedate != ''"> and taskCompletedate = #{taskCompletedate}</if>
             <if test="taskModifieddate != null  and taskModifieddate != ''"> and taskModifieddate = #{taskModifieddate}</if>
             <if test="taskVisible != null and taskVisible != ''">and taskVisible = #{taskVisible}</if>
+            <if test="startDate != null  and startDate != ''">
+                and taskPlanstartdate >=  #{startDate}
+            </if>
+            <if test="endDate != null  and endDate != ''">
+                and taskPlanenddate <![CDATA[ <= ]]>  #{endDate}
+            </if>
+            <if test="dataFilter == true and blockIds != null and blockIds.size() > 0">
+                AND t.blockId in
+                <foreach collection="blockIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="taskVisible != null and taskVisible != ''">and taskVisible = #{taskVisible}</if>
         </where>
     </select>
 
@@ -67,10 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="taskManager != null  and taskManager != ''"> and t.taskManager = #{taskManager}</if>
             <if test="startDate != null  and startDate != ''">
-                and t.taskPlanenddate >=  #{startDate}
+                and t.taskPlanstartdate >=  #{startDate}
             </if>
             <if test="endDate != null  and endDate != ''">
-                and t.taskPlanstartdate <![CDATA[ <= ]]>  #{endDate}
+                and t.taskPlanenddate <![CDATA[ <= ]]>  #{endDate}
             </if>
             <if test="taskAuditor != null and taskAuditor !=''">
                 and t.taskAuditor = #{taskAuditor}