任务管理--查询已完成任务添加项目id参数

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/TaskInfoController.java

@@ -123,7 +123,7 @@ public class TaskInfoController {
     }
 
     /**
-     * 查找登录用户参与的审批已完成的任务
+     * 查询登录用户已完成的任务（指定项目）
      *
      * @return ResMsg
      */

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/TaskInfoMapper.java

@@ -91,8 +91,14 @@ public interface TaskInfoMapper extends JpaRepository<TaskInfoEntity, Integer>,
 
 
     /**
-     * 查询登录用户已完成的任务
+     * 查询登录用户已完成的任务（全部）
      */
     @Query
-    List<TaskInfoEntity> findAllByTaskParticipantContainsAndProjectIdEqualsAndTaskStatusIsAndIsDeleteIs(String userId, String projectId, Integer taskStatus, String isDelete);
+    List<TaskInfoEntity> findAllByTaskParticipantContainsAndTaskStatusEqualsAndIsDeleteEquals(String userId, String taskStatus, String isDelete);
+
+    /**
+     * 查询登录用户已完成的任务（指定项目）
+     */
+    @Query
+    List<TaskInfoEntity> findAllByTaskParticipantContainsAndProjectIdEqualsAndTaskStatusEqualsAndIsDeleteEquals(String userId, String projectId, String taskStatus, String isDelete);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/TaskInfoService.java

@@ -83,7 +83,7 @@ public interface TaskInfoService {
     ResMsg performTask(TaskInfoEntity taskInfoEntity);
 
     /**
-     * 查找登录用户参与的审批已完成的任务
+     * 查询登录用户已完成的任务（指定项目）
      *
      * @param taskStatus
      * @return

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ManHourServiceImpl.java

@@ -67,7 +67,7 @@ public class ManHourServiceImpl implements ManHourService {
         Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(userId, manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getStartDate(), endDate, page);
         //匹配项目信息和任务信息
         List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAll();
-        List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusIsAndIsDeleteIs(userId, FlowTaskStatus.FINISHED, DataIsDeleteEnum.NORMAL.getCode());
+        List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusEqualsAndIsDeleteEquals(userId, String.valueOf(FlowTaskStatus.FINISHED), (DataIsDeleteEnum.NORMAL.getCode()));
         return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
             Map<Object, Object> map1 = new HashMap<>(map);
             for (TaskInfoEntity taskInfo : finishedTasks) {

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/TaskInfoServiceImpl.java

@@ -318,8 +318,8 @@ public class TaskInfoServiceImpl implements TaskInfoService {
 
     @Override
     public ResMsg findTaskIsFinish(TaskInfoVo taskInfoVo, Integer taskStatus) {
-        List<TaskInfoEntity> contains = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusIsAndIsDeleteIs(
-                taskInfoVo.getTaskParticipant().get(0).toString(), taskInfoVo.getProjectId(), taskStatus, DataIsDeleteEnum.NORMAL.getCode());
+        List<TaskInfoEntity> contains = taskInfoMapper.findAllByTaskParticipantContainsAndProjectIdEqualsAndTaskStatusEqualsAndIsDeleteEquals(
+                taskInfoVo.getTaskParticipant().get(0).toString(), taskInfoVo.getProjectId(), String.valueOf(taskStatus), (DataIsDeleteEnum.NORMAL.getCode()));
         return new ResMsg(CodeEnum.OK, contains);
     }