任务计划修改

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/ProjectController.java

@@ -564,8 +564,8 @@ public class ProjectController {
     }
 
     @RequestMapping("/getGanttData")
-    public HttpRespMsg getGanttData(@RequestParam(required = false, defaultValue = "0") Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType,@RequestParam(required = false) Integer justWaitForMe, HttpServletRequest request) {
-        return projectService.getGanttData(type, startDate, endDate, userId, projectId, groupName,taskType,justWaitForMe, request);
+    public HttpRespMsg getGanttData(@RequestParam(required = false, defaultValue = "0") Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType, HttpServletRequest request) {
+        return projectService.getGanttData(type, startDate, endDate, userId, projectId, groupName,taskType, request);
     }
 
     @RequestMapping("/getGanttDataNew")

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskController.java

@@ -171,7 +171,7 @@ public class TaskController {
 
     @RequestMapping("/save")
     @Transactional
-    public HttpRespMsg save(Task task) throws Exception {
+    public HttpRespMsg save(Task task, @RequestParam(required = false, defaultValue = "false") boolean auditPass) throws Exception {
         String userId = request.getHeader("Token");
         String executorListStr = task.getExecutorListStr();
 
@@ -181,6 +181,12 @@ public class TaskController {
         WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
         int isInsert=0;
         int isUpdate=0;
+        Project project = projectMapper.selectById(task.getProjectId());
+        String inchargerId = project.getInchargerId();
+        if (StringUtils.isEmpty(inchargerId)) {
+            msg.setError("请先设置项目经理");
+            return msg;
+        }
         //新建的任务，需要设置创建人，创建时间
         if (task.getId() == null) {
             isInsert=1;
@@ -189,14 +195,6 @@ public class TaskController {
             task.setCreaterName(user.getName());
             task.setCreatorColor(user.getColor());
             task.setCompanyId(user.getCompanyId());
-
-            if (task.getIsTaskPlan()==0&&task.getCheckFirstId()==null){
-                if (task.getProjectId()!=null){
-                    Project project = projectMapper.selectById(task.getProjectId());
-                    task.setCheckFirstId(project.getInchargerId());
-                }
-            }
-
             if (task.getIsTaskPlan()==1){
                 task.setTaskPlan(1);
                 task.setTaskStatus(3);
@@ -216,7 +214,21 @@ public class TaskController {
                 User exeUser = allUsers.stream().filter(al->al.getId().equals(ex.getExecutorId())).findFirst().get();
                 ex.setExecutorName(exeUser.getName());
                 ex.setExecutorColor(exeUser.getColor());
+                ex.setFirstAuditorId(inchargerId);
+                //设置第二负责人，员工部门主要负责人
+                if (exeUser.getDepartmentId() != null && exeUser.getDepartmentId() > 0) {
+                    Department byId = departmentService.getById(exeUser.getDepartmentId());
+                    String managerId = byId.getManagerId();
+                    if (!StringUtils.isEmpty(managerId)) {
+                        ex.setSecondAuditorId(managerId);
+                    } else {
+                        msg.setError("请设置["+byId.getDepartmentName()+"]部门主要负责人");
+                    }
+                }
             });
+            if (msg.code.equals("error")) {
+                return msg;
+            }
             executorList.stream().forEach(ex->{
                 ex.setProjectId(task.getProjectId());
             });
@@ -412,14 +424,12 @@ public class TaskController {
             }
             // 未驳回之前 第一审核人 修改工作计划
             if (task.getIsTaskPlan()==1
-                    && org.apache.commons.lang3.StringUtils.isNotEmpty(task.getCheckFirstId())
-                    &&task.getCheckFirstId().equals(userId)
+                    && auditPass
                     &&task.getTaskStatus()==3){
                 isUpdate=1;
                 task.setTaskStatus(4);//待第二审核人审核
             } else if (task.getIsTaskPlan() == 1
-                    && org.apache.commons.lang3.StringUtils.isNotEmpty(task.getCheckSecondId())
-                    && task.getCheckSecondId().equals(userId)
+                    && auditPass
                     &&task.getTaskStatus()==4) {
                 isUpdate=2;
                 task.setTaskStatus(0);//变化为进行中
@@ -428,31 +438,25 @@ public class TaskController {
             // 驳回后,小组长对计划进行修改
             if (task.getIsTaskPlan()==1
                     &&(task.getTaskStatus()==5||task.getTaskStatus()==6)
-                    &&(!userId.equals(task.getCheckFirstId())&&!userId.equals(task.getCheckSecondId()))
+                    && auditPass //小组长保存并提交
                     ){
                 isUpdate=3;
                 task.setTaskStatus(3);//待第一审核人审核
             }
             // 撤回后,对计划进行修改
-            if (task.getIsTaskPlan()==1
-                    &&(task.getTaskStatus()==2)
-            ){
-                if (user.getId().equals(task.getCheckFirstId())){
+            if (task.getIsTaskPlan()==1 && (task.getTaskStatus()==2) && auditPass) {
+                if (user.getId().equals(project.getInchargerId())) {
                     task.setTaskStatus(4);//待第二审核人审核
                     isUpdate=5;
-                } else if (user.getId().equals(task.getCheckSecondId())) {
-                    task.setTaskStatus(0);//变化为进行中
-                    task.setIsTaskPlan(0);//不再是计划
-                    isUpdate=6;
-                }else {
+                }
+                else {
                     task.setTaskStatus(3);//待第一审核人审核
                     isUpdate=4;
                 }
             }
         }
         if (task.getIsTaskPlan()==1) {
-            if (task.getCheckSecondId() != null && !task.getExecutorList().isEmpty()) {
-                System.out.println("===>"+task.getExecutorList());
+            if (!task.getExecutorList().isEmpty()) {
                 List<User> userManagers = userMapper.selectList(new QueryWrapper<User>()
                         .eq("role_name", "区域经理&PM").eq("company_id",user.getCompanyId()));
                 for (TaskExecutor taskExecutor : task.getExecutorList()) {
@@ -467,13 +471,12 @@ public class TaskController {
         boolean saved = taskService.saveOrUpdate(task);
         //新增成功,给第一审核人发送信息提醒
         if (saved&&isInsert==1){
-            if (task.getIsTaskPlan()==1&& org.apache.commons.lang3.StringUtils.isNotEmpty(task.getCheckFirstId())){
+            if (task.getIsTaskPlan()==1){
                 //给第一审核人发送信息提醒
                 msgRecepientList=new ArrayList<>();
                 log.info("添加工作计划,给第一审核人发送信息提醒");
-                User owner = userMapper.selectById(task.getCheckFirstId());
+                User owner = userMapper.selectById(inchargerId);
                 Information information = new Information();
-                Project project = projectMapper.selectById(task.getProjectId());
                 information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
                 information.setTaskId(task.getId());
                 information.setType(11);
@@ -485,15 +488,16 @@ public class TaskController {
             msgRecepientList=new ArrayList<>();
             //第一审核人修改后, 变成待第二审核人审核
             if (isUpdate==1||isUpdate==5){
-                User owner = userMapper.selectById(task.getCheckSecondId());
-                Information information = new Information();
-                Project project = projectMapper.selectById(task.getProjectId());
-                information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
-                information.setTaskId(task.getId());
-                information.setType(11);
-                information.setUserId(owner.getId());
-                information.setTime(LocalDateTime.now());
-                informationService.save(information);
+                for (TaskExecutor taskExecutor : task.getExecutorList()) {
+                    //给第二审核人发消息
+                    Information information = new Information();
+                    information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
+                    information.setTaskId(task.getId());
+                    information.setType(11);
+                    information.setUserId(taskExecutor.getSecondAuditorId());
+                    information.setTime(LocalDateTime.now());
+                    informationService.save(information);
+                }
 
             }else if(isUpdate==2||isUpdate==6){
                 List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", task.getId()));
@@ -513,10 +517,9 @@ public class TaskController {
             } else if (isUpdate==3) {
                 //给第一审核人发送信息提醒
                 log.info("驳回后小组长修改,给第一审核人发送信息提醒");
-                User owner = userMapper.selectById(task.getCheckFirstId());
+                User owner = userMapper.selectById(inchargerId);
                 Information information = new Information();
                 information.setType(11);
-                Project project = projectMapper.selectById(task.getProjectId());
                 information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
                 information.setTaskId(task.getId());
                 information.setUserId(owner.getId());
@@ -525,10 +528,9 @@ public class TaskController {
             } else if (isUpdate==4) {
                 //给第一审核人发送信息提醒
                 log.info("撤销后小组长修改,给第一审核人发送信息提醒");
-                User owner = userMapper.selectById(task.getCheckFirstId());
+                User owner = userMapper.selectById(inchargerId);
                 Information information = new Information();
                 information.setType(11);
-                Project project = projectMapper.selectById(task.getProjectId());
                 information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
                 information.setTaskId(task.getId());
                 information.setUserId(owner.getId());
@@ -552,7 +554,6 @@ public class TaskController {
             }
         }
 
-
         TaskComment comment = new TaskComment();
         comment.setTaskId(task.getId());
         comment.setUserId(user.getId());
@@ -611,6 +612,7 @@ public class TaskController {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         Task task = taskMapper.selectById(taskId);
+        Project project = projectMapper.selectById(task.getProjectId());
         if (task.getTaskPlan()!=1&&task.getIsTaskPlan()!=1){
             msg.setError("当前计划已变成任务不能撤回计划");
             return msg;
@@ -626,8 +628,8 @@ public class TaskController {
                 task.setTaskStatus(2);
                 taskMapper.updateById(task);
                 Information information = new Information();
-                User owner = userMapper.selectById(task.getCheckFirstId());
-                Project project = projectMapper.selectById(task.getProjectId());
+
+                User owner = userMapper.selectById(project.getInchargerId());
                 information.setMsg(project.getProjectName()+"项目有预计FTE计划撤销");
 //                information.setTaskId(task.getId());
                 information.setUserId(owner.getId());
@@ -640,18 +642,11 @@ public class TaskController {
             }
         }
         //计划的第一审核人
-        String checkFirstId = task.getCheckFirstId();
+        String checkFirstId = project.getInchargerId();
         if (checkFirstId!=null&&checkFirstId.equals(user.getId())){
             msg.setError("项目经理不能撤回");
             return msg;
         }
-
-        //计划的第二审核人
-        String checkSecondId = task.getCheckSecondId();
-        if (checkSecondId!=null&&checkSecondId.equals(user.getId())){
-            msg.setError("区域经理不能撤回");
-            return msg;
-        }
         return msg;
     }
 
@@ -1051,33 +1046,8 @@ public class TaskController {
             String name = userMapper.selectById(list.get(0).getCreatorId()).getName();
             list.get(0).setCreatorName(name);
         }
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
         //查询任务的执行人
-//        List<TaskExecutor> executorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", t.getId()));
-        List<TaskExecutor> executorList =taskExecutorMapper.getInfoWithFileCharge(t.getId());
-        if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-            executorList.forEach(e->{
-                e.setFileChargeOneName("$userName="+e.getChargeOneWxId()+"$");
-                e.setFileChargeTwoName("$userName="+e.getChargeTwoWxId()+"$");
-                if(e.getServiceId()!=null){
-                    Optional<SapProjectService> first = serviceList.stream().filter(s -> s.getId().equals(e.getServiceId())).findFirst();
-                    if(first.isPresent()){
-                        e.setServiceName(first.get().getServiceName());
-                        e.setServiceCode(first.get().getServiceCode());
-                    }
-                }
-            });
-        }else{
-            executorList.forEach(e->{
-                if(e.getServiceId()!=null){
-                    Optional<SapProjectService> first = serviceList.stream().filter(s -> s.getId().equals(e.getServiceId())).findFirst();
-                    if(first.isPresent()){
-                        e.setServiceName(first.get().getServiceName());
-                        e.setServiceCode(first.get().getServiceCode());
-                    }
-                }
-            });
-        }
+        List<TaskExecutor> executorList = taskExecutorMapper.getInfoWithFileCharge(t.getId());
 
         t.setExecutorList(executorList);
         //设置人员选择下拉列表
@@ -1154,16 +1124,7 @@ public class TaskController {
         if (isSubstitude == 0 || userId == null) {
             userId = request.getHeader("Token");
         }
-
         msg.data = taskMapper.recentSimpleList(projectId, userId, stage, groupId);
-
-//        if (isSubstitude == 0) {
-//            msg.data = taskMapper.recentSimpleList(projectId, userId, stage, groupId);
-//        } else {
-//            //代填的情况，获取的是项目中的所有任务
-//            msg.data = taskMapper.recentSimpleList(projectId, null, stage, groupId);
-//        }
-
         return msg;
     }
 
@@ -1211,7 +1172,7 @@ public class TaskController {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        //状态检查
+        Project project = projectMapper.selectById(task.getProjectId());
         int count= projectLeaderMapper.selectCountIsLeader(id,user.getId());
         //是这个计划的小组长
         if (count>0){
@@ -1231,7 +1192,7 @@ public class TaskController {
             }
         }
 
-        if (task.getCheckFirstId()!=null&&task.getCheckFirstId().equals(user.getId())){
+        if (project.getInchargerId()!=null&&project.getInchargerId().equals(user.getId())){
             if(task.getTaskStatus()==4&&task.getIsTaskPlan()==1){
                 msg.setError("当前计划已处于二级审核状态,项目经理不能删除");
                 return msg;
@@ -1241,8 +1202,9 @@ public class TaskController {
             }
         }
 
-        if (task.getCheckSecondId()!=null&&task.getCheckSecondId().equals(user.getId())){
-            if(task.getTaskStatus()==3&&task.getIsTaskPlan()==1){
+        List<TaskExecutor> executorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", id));
+        for (TaskExecutor executor : executorList) {
+            if (task.getTaskStatus()==3&&task.getIsTaskPlan()==1 && user.getId().equals(executor.getSecondAuditorId())) {
                 msg.setError("当前计划已处于一级审核状态,区域经理不能删除");
                 return msg;
             }
@@ -1550,6 +1512,9 @@ public class TaskController {
         } else if (viewId == 2) {
             //我创建的任务
             queryWrapper.eq("creater_id", userId);
+        } else if (viewId == 3) {
+            //我审核的
+
         }
         if(type!=null){
             queryWrapper.eq("task_type",type);
@@ -1588,7 +1553,12 @@ public class TaskController {
         }
         //美莱德 任务计划状态是1
         queryWrapper.ne("is_task_plan",1);
-        List<Task> list = taskMapper.getTaskWithProjectName(queryWrapper,pageStart, pageSize,companyId,branchDepartment);
+        List<TaskWithAuditor> list;
+        if (viewId == 3) {
+            list = taskMapper.getMyAuditTaskList(queryWrapper,pageStart, pageSize,userId);
+        } else {
+            list = taskMapper.getTaskWithProjectName(queryWrapper,pageStart, pageSize,companyId,branchDepartment);
+        }
         List<Integer> collect = list.stream().map(l -> l.getId()).distinct().collect(Collectors.toList());
         collect.add(-1);
         List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().in("task_id", collect));

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskTypeController.java

@@ -0,0 +1,78 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.Task;
+import com.management.platform.entity.TaskType;
+import com.management.platform.service.TaskService;
+import com.management.platform.service.TaskTypeService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.HttpRequestHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-05-12
+ */
+@RestController
+@RequestMapping("/task-type")
+public class TaskTypeController {
+
+    @Resource
+    private TaskTypeService taskTypeService;
+    @Resource
+    private TaskService taskService;
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(@RequestParam Integer companyId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = taskTypeService.list(new QueryWrapper<TaskType>().eq("company_id", companyId));
+        return msg;
+    }
+
+    @RequestMapping("/save")
+    public HttpRespMsg save(TaskType taskType) {
+        //校验名称是否重叠
+        HttpRespMsg msg = new HttpRespMsg();
+        if (taskType.getId() == null) {
+            int cnt = taskTypeService.count(new QueryWrapper<TaskType>().eq("name", taskType.getName()).eq("company_id", taskType.getCompanyId()));
+            if (cnt > 0) {
+                msg.setError("名称重复");
+                return msg;
+            }
+        } else {
+            int cnt = taskTypeService.count(new QueryWrapper<TaskType>().ne("id", taskType.getId()).eq("name", taskType.getName()).eq("company_id", taskType.getCompanyId()));
+            if (cnt > 0) {
+                msg.setError("名称重复");
+                return msg;
+            }
+        }
+
+        taskTypeService.save(taskType);
+        return new HttpRespMsg();
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id) {
+        //检查任务类型是否已经被使用
+        HttpRespMsg msg = new HttpRespMsg();
+        int cnt = taskService.count(new QueryWrapper<Task>().eq("task_plan_type", id));
+        if (cnt > 0) {
+            msg.setError("任务类型已经被使用");
+            return msg;
+        }
+        taskTypeService.removeById(id);
+        return new HttpRespMsg();
+    }
+}
+

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -820,7 +820,6 @@ public class WeiXinCorpController {
                     ExcelExportServiceImpl.corpwxJobCenter.put(jobId, result);
                     ReportServiceImpl.corpwxJobCenter.put(jobId, result);
                     UserController.corpwxJobCenter.put(jobId, result);
-                    TaskController.corpwxJobCenter.put(jobId, result);
                     //注册到redis,其他系统可能需要用
                     redisUtil.setString("corpwxJobCenter"+jobId, jsonObject.toString(), 600);
                 } else if ("auto_activate".equals(infoType)) {

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/entity/Task.java

@@ -85,7 +85,7 @@ public class Task extends Model<Task> {
     private Integer taskLevel;
 
     /**
-     * 任务状态,0-进行中 1-已完成 2-已撤销 3-待第一审核人审核 4-待第二审核人审核 5-第一审核人驳回  6-第二审核人驳回
+     * 任务状态,0-进行中 1-已完成 2-已撤销 3-待第一审核人审核 4-待第二审核人审核 5-驳回
      */
     @TableField("task_status")
     private Integer taskStatus;
@@ -174,19 +174,6 @@ public class Task extends Model<Task> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate finishDate;
 
-    @TableField(exist = false)
-    private List<Task> subTaskList;
-
-    @TableField(exist = false)
-    private int subTaskFinishNum;
-    @TableField(exist = false)
-    private String stagesName;
-
-    @TableField(exist = false)
-    private TaskProgress progress;
-
-    @TableField(exist = false)
-    private String projectName;
     /**
      * 开始日期
      */
@@ -213,80 +200,47 @@ public class Task extends Model<Task> {
     @TableField("sap_task_code")
     private String sapTaskCode;
 
+    /**
+     * 任务预估成本
+     */
+    @TableField("plan_cost")
+    private Integer planCost;
+
+    /**
+     * 完成任务时，成果文件是否必传
+     */
+    @TableField("attach_file_required")
+    private Boolean attachFileRequired;
+
     /**
      * 任务计划类型 1.出差 2.在办公事处 3.请假
      */
     @TableField("task_plan_type")
     private Integer taskPlanType;
 
+    /**
+     * 标记任务计划 :0 否 ,1 是 ,默认 0
+     */
+    @TableField("task_plan")
+    private Integer taskPlan;
+
     /**
      * 是否是任务计划 :0 否 ,1 是 ,默认 0
      */
     @TableField("is_task_plan")
     private Integer isTaskPlan;
 
-    @TableField("task_plan")
-    private Integer taskPlan;
-
     /**
-     * 任务计划第一审核人id
-     */
-    @TableField("check_first_id")
-    private String checkFirstId;
-
-    /**
-     * 任务计划第二审核人id
-     */
-    @TableField("check_second_id")
-    private String checkSecondId;
-
-//    /**文件审核人一[部门负责人]id*/
-//    @TableField("charge_one_id")
-//    private String chargeOneId;
-//
-//
-//    /**文件审核人一的审核状态 0待审核 1通过 2驳回*/
-//    @TableField("charge_one_status")
-//    private Integer chargeOneStatus;
-//
-//    /**文件审核人一的审核时间*/
-//    @TableField("charge_one_time")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private Date chargeOneTime;
-//
-//    /**文件审核人二[项目审核人]id*/
-//    @TableField("charge_two_id")
-//    private String chargeTwoId;
-//
-//
-//    /**文件审核人二的审核状态 0待审核 1通过 2驳回*/
-//    @TableField("charge_two_status")
-//    private Integer chargeTwoStatus;
-//
-//    /**文件审核人二的审核时间*/
-//    @TableField("charge_two_time")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private Date chargeTwoTime;
-//
-//    /**文件审核阶段 1审核人一 2审核人二 3都审核通过*/
-//    @TableField("charge_stage")
-//    private Integer chargeStage;
-//
-//    /**文件最终审核状态  0未通过 1通过*/
-//    @TableField("final_charge_status")
-//    private Integer finalChargeStatus;
-//
-//    /**文件审核驳回原因*/
-//    @TableField("file_reject_reason")
-//    private String fileRejectReason;
+     * 研究中心
+     */
+    @TableField("center_id")
+    private Integer centerId;
 
     /**
-     * 任务预估成本
+     * 研究中心名称
      */
-    @TableField("plan_cost")
-    private Integer planCost;
+    @TableField("center_name")
+    private String centerName;
     /**
      * 项目负责人id
      */
@@ -327,26 +281,19 @@ public class Task extends Model<Task> {
      * 任务的外置状态显示 1审核中[待审核+(审核通过)] 2驳回[存在驳回文件]  3审核通过[全部审核通过]
      * */
     private int fileChargeStatus;
-    /**
-     * 完成任务时，成果文件是否必传
-     */
-    @TableField("attach_file_required")
-    private Boolean attachFileRequired;
-
-
-    /**
-     * 研究中心
-     */
-    @TableField("center_id")
-    private Integer centerId;
+    @TableField(exist = false)
+    private List<Task> subTaskList;
 
-    /**
-     * 研究中心名称
-     */
-    @TableField("center_name")
-    private String centerName;
+    @TableField(exist = false)
+    private int subTaskFinishNum;
+    @TableField(exist = false)
+    private String stagesName;
 
+    @TableField(exist = false)
+    private TaskProgress progress;
 
+    @TableField(exist = false)
+    private String projectName;
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/entity/TaskExecutor.java

@@ -1,24 +1,24 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author Seyason
- * @since 2025-01-04
+ * @since 2025-05-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -72,32 +72,41 @@ public class TaskExecutor extends Model<TaskExecutor> {
     @TableField("real_cost")
     private Integer realCost;
 
-
-    @TableField(exist = false)
-    private String serviceName;
-
-    @TableField(exist = false)
-    private String serviceCode;
-
-    /**文件审核人一[自选]id*/
+    /**
+     * 文件审核人一
+     */
     @TableField("file_charge_one_id")
     private String fileChargeOneId;
 
-    @TableField(exist = false)
-    private String fileChargeOneName;
-
-    @TableField(exist = false)
-    private String chargeOneWxId;
-    /**文件审核人二[自选]id*/
+    /**
+     * 文件审核人二
+     */
     @TableField("file_charge_two_id")
     private String fileChargeTwoId;
 
+    /**
+     * 第一审核人
+     */
+    @TableField("first_auditor_id")
+    private String firstAuditorId;
+
+    /**
+     * 第二审核人
+     */
+    @TableField("second_auditor_id")
+    private String secondAuditorId;
+
     @TableField(exist = false)
     private String fileChargeTwoName;
 
     @TableField(exist = false)
     private String chargeTwoWxId;
 
+    @TableField(exist = false)
+    private String fileChargeOneName;
+
+    @TableField(exist = false)
+    private String chargeOneWxId;
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -128,5 +137,4 @@ public class TaskExecutor extends Model<TaskExecutor> {
         executor.setExecutorName(task.getExecutorName());
         executor.setExecutorColor(task.getExecutorColor());
     }
-
 }

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/entity/TaskType.java

@@ -0,0 +1,60 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaskType extends Model<TaskType> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 是否需要审核
+     */
+    @TableField("need_audit")
+    private Boolean needAudit;
+
+    /**
+     * 所属公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 颜色
+     */
+    @TableField("color")
+    private String color;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/entity/TaskWithAuditor.java

@@ -0,0 +1,16 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class TaskWithAuditor extends Task {
+    @TableField(exist = false)
+    private String firstAuditorId;
+    @TableField(exist = false)
+    private String firstAuditorName;
+    @TableField(exist = false)
+    private String secondAuditorId;
+    @TableField(exist = false)
+    private String secondAuditorName;
+}

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -68,39 +68,37 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Map> getTaskPlanByMemb(@Param("userIds") List<String> userIds, @Param("startDate") String startDate,
                                     @Param("endDate") String endDate, @Param("companyId") Integer companyId,
-                                @Param("creatorId") String creatorId,@Param("justWaitForMe")Integer justWaitForMe
+                                    @Param("creatorId") String creatorId
                                 );
 
     List<Map> getTaskPlanByProject(@Param("projectIds") List<Integer> projectIds, @Param("startDate") String startDate,
                                 @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("groupName")String groupName,@Param("taskType")Integer taskType,
-                                   @Param("creatorId") String creatorId,@Param("justWaitForMe")Integer justWaitForMe);
+                                   @Param("creatorId") String creatorId);
     List<Map> getTaskPlanWithLeave(@Param("userIds") List<String> userIds, @Param("startDate") String startDate,
                                    @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("creatorId") String creatorId,@Param("targetUserId") String targetUserId);
 
     List<Map> getTaskPlanByGeneralMemb(@Param("userIds") List<String> userIds, @Param("startDate") String startDate,
-                                @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("creatorId") String creatorId,@Param("targetUserId") String targetUserId,
-                                       @Param("justWaitForMe")Integer justWaitForMe);
+                                @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("creatorId") String creatorId,@Param("targetUserId") String targetUserId
+                                       );
 
     List<Map> getTaskPlanByProManager(@Param("userIds") List<String> userIds, @Param("startDate") String startDate,
-                                      @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,@Param("targetUserId") String targetUserId,
-                                      @Param("justWaitForMe")Integer justWaitForMe);
+                                      @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,@Param("targetUserId") String targetUserId
+                                      );
     List<Map> getTaskPlanByAreaManager(@Param("userIds") List<String> userIds, @Param("startDate") String startDate,
-                                      @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,@Param("targetUserId") String targetUserId,
-                                       @Param("justWaitForMe")Integer justWaitForMe);
+                                      @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,@Param("targetUserId") String targetUserId
+                                       );
 
     List<Map> getTaskPlanByProjectGeneralMemb(@Param("projectIds") List<Integer> projectIds, @Param("startDate") String startDate,
                                    @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("creatorId") String creatorId,
-                                              @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId,
-                                              @Param("justWaitForMe")Integer justWaitForMe);
+                                              @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId
+                                              );
 
     List<Map> getTaskPlanByProjectManager(@Param("projectIds") List<Integer> projectIds, @Param("startDate") String startDate,
                                               @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,
-                                          @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId,
-                                          @Param("justWaitForMe")Integer justWaitForMe);
+                                          @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId);
     List<Map> getTaskPlanByProjectAreaManager(@Param("projectIds") List<Integer> projectIds, @Param("startDate") String startDate,
                                           @Param("endDate") String endDate, @Param("companyId") Integer companyId,@Param("managerId") String managerId,
-                                              @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId,
-                                              @Param("justWaitForMe")Integer justWaitForMe);
+                                              @Param("groupName")String groupName,@Param("taskType")Integer taskType,@Param("targetProjectId")Integer targetProjectId);
 
     List<ProjectWithStage> selectWithStage(Integer companyId, Integer startIndex, Integer endIndex, Integer projectId,String inchargerId,String startDate,String endDate);
 

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -88,4 +88,7 @@ public interface TaskMapper extends BaseMapper<Task> {
     List<ProjectTaskTimeCostVO> getProjectAllTaskTimeCost(@Param("projectId") Integer projectId);
 
     List<ProjectTimeCostVO> getProjectTaskTimeCostByIds(@Param("projectIds")List<Integer> projectIds);
+
+    List getMyAuditTaskList(@Param(Constants.WRAPPER) Wrapper wrapper, Integer pageStart, Integer pageSize,String userId);
+
 }

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/mapper/TaskTypeMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.TaskType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-05-12
+ */
+public interface TaskTypeMapper extends BaseMapper<TaskType> {
+
+}

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/ProjectService.java

@@ -116,7 +116,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg exportCustomerProjectInAndOut(HttpServletRequest request);
 
-    HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType,Integer justWaitForMe, HttpServletRequest request);
+    HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType, HttpServletRequest request);
 
     HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames,String startDate,String endDate);
 

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/TaskTypeService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.TaskType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-05-12
+ */
+public interface TaskTypeService extends IService<TaskType> {
+
+}

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -20,7 +20,6 @@ import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.*;
 import com.dingtalk.api.response.*;
 import com.management.platform.constant.Constant;
-import com.management.platform.controller.TaskController;
 import com.management.platform.controller.UserController;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.UserVO;
@@ -1464,18 +1463,6 @@ public class DingDingServiceImpl implements DingDingService {
                                         }
                                     }
                                 }
-                            }else if(139 == bizType){
-                                JSONObject actionBizData = JSONObject.parseObject(bizItem.getString("biz_data"));
-                                String syncAction = actionBizData.getString("syncAction");
-                                if("transfer_contact_id_job_result".equals(syncAction)){
-                                    bizLogger.info("异步转译通讯录id任务完成通知");
-                                    String jobId = actionBizData.getString("jobId");
-                                    Integer status = actionBizData.getInteger("status");
-                                    ExcelExportServiceImpl.corpddJobCenter.put(jobId, status);
-                                    ReportServiceImpl.corpddJobCenter.put(jobId, status);
-                                    UserController.corpddJobCenter.put(jobId, status);
-                                    TaskController.corpddJobCenter.put(jobId, status);
-                                }
                             }
                         }
                     }

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/InformationServiceImpl.java

@@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.generator.config.IFileCreate;
 import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.GanttDataItem;
-import com.management.platform.mapper.InformationMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
+import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -37,6 +36,8 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
 
     @Resource
     private UserMapper userMapper;
+    @Resource
+    TaskExecutorMapper taskExecutorMapper;
 
     @Resource
     private WxCorpInfoMapper wxCorpInfoMapper;
@@ -52,6 +53,8 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
     private ProjectLeaderService projectLeaderService;
     @Resource
     private ProjectService projectService;
+    @Autowired
+    private ProjectMapper projectMapper;
 
     @Override
     public HttpRespMsg getInformationList(HttpServletRequest request) {
@@ -60,8 +63,8 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
             User user = userMapper.selectById(request.getHeader("token"));
 
             int countLeader = projectLeaderService.count(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
-            int countFirstCheck = projectService.count(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
-            int countSecondCheck = taskService.count(new QueryWrapper<Task>().eq("check_second_id", user.getId()));
+            int countFirstCheck = projectMapper.selectCount(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
+            int countSecondCheck = taskExecutorMapper.selectCount(new QueryWrapper<TaskExecutor>().eq("second_auditor_id", user.getId()));
 
             List<Information> information = informationMapper.selectList(new QueryWrapper<Information>()
                     .eq("user_id", user.getId()).orderByDesc("time").last("LIMIT 20"));
@@ -89,7 +92,7 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                     String newMsg = msg.replace(name, "$userName=" + userWxId + "$");
                     info.setMsg(newMsg);
                 }
-                if (Constant.MLD_COMPANY_ID==user.getCompanyId()&&info.getTaskId()!=null){
+                if (info.getTaskId()!=null){
                     Task task = taskService.getById(info.getTaskId());
                     if (task!=null){
                         GanttDataItem dataItem = new GanttDataItem();
@@ -100,8 +103,8 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                         } else if (countFirstCheck > 0 || countSecondCheck > 0) {
                             dataItem.setLeaderOrManager(2);
                         }
-                        dataItem.setCheckFirstId(task.getCheckFirstId());
-                        dataItem.setCheckSecondId(task.getCheckSecondId());
+//                        dataItem.setCheckFirstId(task.getCheckFirstId());
+//                        dataItem.setCheckSecondId(task.getCheckSecondId());
                         dataItem.setObjType(2);
                         dataItem.setIsTaskPlan(task.getIsTaskPlan());
                         dataItem.setTaskPlan(task.getTaskPlan());

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1601,23 +1601,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     projectVO.setProviderInfoList(mapList);
                 }
-                if(companyId==936){
-                    Optional<ProjectSeparate> first1 = projectSeparateList.stream().filter(ps -> ps.getId().equals(project.getId())).findFirst();
-                    if(first1.isPresent()){
-                        projectVO.setProjectSeparate(first1.get());
-                    }
-                }else if (companyId==Constant.MLD_COMPANY_ID){
-                    if (!leaderList.isEmpty()) {
-                        List<ProjectLeader> leaderCollect = leaderList.stream().filter(l ->l.getProjectId()!=null&& l.getProjectId().equals(project.getId())).collect(Collectors.toList());
-                        leaderCollect.forEach(l -> {
-                            Optional<User> userOptional = userList.stream().filter(u -> u.getId().equals(l.getLeaderId())).findFirst();
-                            if (userOptional.isPresent()) {
-                                User user1 = userOptional.get();
-                                l.setUserName(user1.getName());
-                            }
-                        });
-                        projectVO.setLeaderList(leaderCollect);
-                    }
+                if (!leaderList.isEmpty()) {
+                    List<ProjectLeader> leaderCollect = leaderList.stream().filter(l ->l.getProjectId()!=null&& l.getProjectId().equals(project.getId())).collect(Collectors.toList());
+                    leaderCollect.forEach(l -> {
+                        Optional<User> userOptional = userList.stream().filter(u -> u.getId().equals(l.getLeaderId())).findFirst();
+                        if (userOptional.isPresent()) {
+                            User user1 = userOptional.get();
+                            l.setUserName(user1.getName());
+                        }
+                    });
+                    projectVO.setLeaderList(leaderCollect);
                 }
 
                 //工程专业版：计算当前项目的总进度
@@ -1868,24 +1861,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     } else {
                         project.setCustomerName("");
                     }
-                    if (companyId==Constant.MLD_COMPANY_ID){
-                        if (leaderIds!=null&&leaderIds.length>0) {
-                            List<User> userManagers = userMapper.selectList(new QueryWrapper<User>()
-                                    .eq("role_name", "区域经理&PM").eq("company_id",companyId));
-                            for (String leaderId : leaderIds) {
-                                ProjectLeader leader = new ProjectLeader();
-                                leader.setProjectId(project.getId());
-                                leader.setLeaderId(leaderId);
-                                if (!userManagers.isEmpty()){
-                                    boolean b = userManagers.stream().anyMatch(u -> u.getId().equals(leaderId));
-                                    if (b){
-                                        httpRespMsg.setError("区域经理不能担任小组长");
-                                        return httpRespMsg;
-                                    }
+                    if (leaderIds!=null&&leaderIds.length>0) {
+                        List<User> userManagers = userMapper.selectList(new QueryWrapper<User>()
+                                .eq("role_name", "区域经理&PM").eq("company_id",companyId));
+                        for (String leaderId : leaderIds) {
+                            ProjectLeader leader = new ProjectLeader();
+                            leader.setProjectId(project.getId());
+                            leader.setLeaderId(leaderId);
+                            if (!userManagers.isEmpty()){
+                                boolean b = userManagers.stream().anyMatch(u -> u.getId().equals(leaderId));
+                                if (b){
+                                    httpRespMsg.setError("区域经理不能担任小组长");
+                                    return httpRespMsg;
                                 }
-                                leader.setCompanyId(companyId);
-                                leaderArrayList.add(leader);
                             }
+                            leader.setCompanyId(companyId);
+                            leaderArrayList.add(leader);
                         }
                     }
                     if (projectMapper.insert(project) == 0) {
@@ -1899,11 +1890,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             updateProjectKeyNodesData(projectKeyNodesData, project.getId());
                         }
 
-                    }if (companyId==Constant.MLD_COMPANY_ID) {
-                        if (leaderIds != null && leaderIds.length > 0) {
-                            leaderArrayList.forEach(l->l.setProjectId(project.getId()));
-                            projectLeaderService.saveBatch(leaderArrayList);
-                        }
+                    }
+                    if (leaderIds != null && leaderIds.length > 0) {
+                        leaderArrayList.forEach(l->l.setProjectId(project.getId()));
+                        projectLeaderService.saveBatch(leaderArrayList);
                     }
                     id = project.getId();
                     if(companyId==936){
@@ -2140,13 +2130,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //httpRespMsg.setError("操作失败");
                     httpRespMsg.setError(MessageUtils.message("other.operationFail"));
                 } else {
-                    if (Constant.MLD_COMPANY_ID==companyId){
-                        //项目经理换人,对应任务计划的第一审核人得换
-                        String inchargerId_old = oldProject.getInchargerId();
-                        if (!inchargerId.equals(inchargerId_old)){
-                            taskService.update(null,new UpdateWrapper<Task>().eq("project_id",oldProject.getId())
-                                    .eq("task_plan",1).set("check_first_id",inchargerId));
-                        }
+                    //项目经理换人,对应任务计划的第一审核人得换
+                    String inchargerId_old = oldProject.getInchargerId();
+                    if (!inchargerId.equals(inchargerId_old)){
+                        taskService.update(null,new UpdateWrapper<Task>().eq("project_id",oldProject.getId())
+                                .eq("task_plan",1).set("check_first_id",inchargerId));
                     }
                     if (customerId == null) {
                         //去掉客户
@@ -2183,36 +2171,26 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 operationRecord.setOperatorName(user.getName());
                 operationRecord.setOperationTime(LocalDateTime.now());
                 operationRecord.setCompanyId(companyId);
-                if(companyId==936){
-                    projectSeparate.setId(id);
-                    if(oldSeparate!=null){
-                        if(!onlyChangeParticipate){
-                            String s = beanChangeUtil.contrastObj(oldSeparate, projectSeparate);
-                            content+="\n"+s;
-                        }
-                    }
-                }else if (companyId==Constant.MLD_COMPANY_ID){
-                    projectLeaderService.remove(new QueryWrapper<ProjectLeader>().eq("project_id",p.getId()));
-                    List<User> userManagers = userMapper.selectList(new QueryWrapper<User>()
-                            .eq("role_name", "区域经理&PM").eq("company_id",companyId));
-                    if (leaderIds!=null&&leaderIds.length>0) {
-                        ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
-                        for (String leaderId : leaderIds) {
-                            ProjectLeader leader = new ProjectLeader();
-                            leader.setProjectId(p.getId());
-                            leader.setLeaderId(leaderId);
-                            leader.setCompanyId(companyId);
-                            if (!userManagers.isEmpty()){
-                                boolean b = userManagers.stream().anyMatch(u -> u.getId().equals(leaderId));
-                                if (b){
-                                    httpRespMsg.setError("区域经理不能担任小组长");
-                                    return httpRespMsg;
-                                }
+                projectLeaderService.remove(new QueryWrapper<ProjectLeader>().eq("project_id",p.getId()));
+                List<User> userManagers = userMapper.selectList(new QueryWrapper<User>()
+                        .eq("role_name", "区域经理&PM").eq("company_id",companyId));
+                if (leaderIds!=null&&leaderIds.length>0) {
+                    ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
+                    for (String leaderId : leaderIds) {
+                        ProjectLeader leader = new ProjectLeader();
+                        leader.setProjectId(p.getId());
+                        leader.setLeaderId(leaderId);
+                        leader.setCompanyId(companyId);
+                        if (!userManagers.isEmpty()){
+                            boolean b = userManagers.stream().anyMatch(u -> u.getId().equals(leaderId));
+                            if (b){
+                                httpRespMsg.setError("区域经理不能担任小组长");
+                                return httpRespMsg;
                             }
-                            leaderArrayList.add(leader);
                         }
-                        projectLeaderService.saveBatch(leaderArrayList);
+                        leaderArrayList.add(leader);
                     }
+                    projectLeaderService.saveBatch(leaderArrayList);
                 }
                 operationRecord.setContent(content);
                 //operationRecord.setModuleName("项目管理");
@@ -4804,7 +4782,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String targetUserId, Integer targetProjectId, String groupName,Integer taskType,Integer justWaitForMe, HttpServletRequest request) {
+    public HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String targetUserId, Integer targetProjectId, String groupName,Integer taskType,HttpServletRequest request) {
         //根据人员权限来获取，
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
@@ -4865,63 +4843,61 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 String lsLastItemId = null;
                 String btLastItemId = null;
                 //按人员获取
-                ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId(),user.getId(),justWaitForMe);
+                ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId(),user.getId());
                 System.out.println("renyuan==>"+ganttData.size());
-                if (user.getCompanyId()==Constant.MLD_COMPANY_ID){
-                    List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
-                    //是小组长
-                    if (!leaderList.isEmpty()){
-                        List<Integer> projectIdList = leaderList.stream().map(ProjectLeader::getProjectId).collect(Collectors.toList());
-                        projectIdList.add(-1);
-                        List<Participation> participations = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", projectIdList));
-                        List<String> userProjectIds = participations.stream().distinct().map(Participation::getUserId).collect(Collectors.toList());
-                        userProjectIds.add("-1");
-                        userIdsExtra.addAll(userProjectIds);
-                        List<Map> taskPlanByGeneralMemb = projectMapper.getTaskPlanByGeneralMemb(userProjectIds, startDate, endDate, user.getCompanyId(), user.getId(),targetUserId,justWaitForMe);
-                        for (Map map : taskPlanByGeneralMemb) {
-                            map.put("leaderOrManager",1);
-                        }
-                        List<Map> taskPlanWithLeave = projectMapper.getTaskPlanWithLeave(null, startDate, endDate, user.getCompanyId(), user.getId(), targetUserId);
-                        for (Map map : taskPlanWithLeave) {
-                            map.put("leaderOrManager",1);
-                        }
-                        ganttData.addAll(taskPlanByGeneralMemb);
-                        ganttData.addAll(taskPlanWithLeave);
-                        System.out.println("renyuan0==>"+taskPlanByGeneralMemb.size());
-                        System.out.println("renyuan1==>"+taskPlanWithLeave.size());
-                    }
-                    //找到自己担任项目经理的项目,: is_task_plan==1 ,checkFirstId=自己的id 并且 task_status=3
-                    List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
-                    if (!projectList.isEmpty()){
-                        List<Integer> projectIdList = projectList.stream().map(Project::getId).collect(Collectors.toList());
-                        projectIdList.add(-1);
-                        List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("project_id", projectIdList).isNotNull("executor_id"));
-                        List<String> collectUserIdList = executorList.stream().distinct().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
-                        collectUserIdList.add("-1");
-                        userIdsExtra.addAll(collectUserIdList);
-                        List<Map> getTaskPlanByProManager = projectMapper.getTaskPlanByProManager(collectUserIdList, startDate, endDate, user.getCompanyId(),user.getId(),targetUserId,justWaitForMe);
-                        for (Map map : getTaskPlanByProManager) {
-                            map.put("leaderOrManager",2);
-                        }
-                        System.out.println("renyuan2==>"+getTaskPlanByProManager.size());
-                        ganttData.addAll(getTaskPlanByProManager);
-                    }
-
-                    if (user.getRoleName().equals("区域经理&PM")){
-                        List<Task> taskList = taskService.list(new QueryWrapper<Task>().eq("check_second_id", user.getId()));
-                        List<Integer> taskIdList = taskList.stream().map(Task::getId).collect(Collectors.toList());
-                        taskIdList.add(-1);
-                        List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("task_id", taskIdList).isNotNull("executor_id"));
-                        List<String> collectUserIdList = executorList.stream().distinct().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
-                        collectUserIdList.add("-1");
-                        userIdsExtra.addAll(collectUserIdList);
-                        List<Map> getTaskPlanByProManager = projectMapper.getTaskPlanByAreaManager(collectUserIdList, startDate, endDate, user.getCompanyId(),user.getId(),targetUserId,justWaitForMe);
-                        for (Map map : getTaskPlanByProManager) {
-                            map.put("leaderOrManager",2);
-                        }
-                        System.out.println("renyuan3==>"+getTaskPlanByProManager.size());
-                        ganttData.addAll(getTaskPlanByProManager);
-                    }
+                List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
+                //是小组长
+                if (!leaderList.isEmpty()){
+                    List<Integer> projectIdList = leaderList.stream().map(ProjectLeader::getProjectId).collect(Collectors.toList());
+                    projectIdList.add(-1);
+                    List<Participation> participations = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", projectIdList));
+                    List<String> userProjectIds = participations.stream().distinct().map(Participation::getUserId).collect(Collectors.toList());
+                    userProjectIds.add("-1");
+                    userIdsExtra.addAll(userProjectIds);
+                    List<Map> taskPlanByGeneralMemb = projectMapper.getTaskPlanByGeneralMemb(userProjectIds, startDate, endDate, user.getCompanyId(), user.getId(),targetUserId);
+                    for (Map map : taskPlanByGeneralMemb) {
+                        map.put("leaderOrManager",1);
+                    }
+                    List<Map> taskPlanWithLeave = projectMapper.getTaskPlanWithLeave(null, startDate, endDate, user.getCompanyId(), user.getId(), targetUserId);
+                    for (Map map : taskPlanWithLeave) {
+                        map.put("leaderOrManager",1);
+                    }
+                    ganttData.addAll(taskPlanByGeneralMemb);
+                    ganttData.addAll(taskPlanWithLeave);
+                    System.out.println("renyuan0==>"+taskPlanByGeneralMemb.size());
+                    System.out.println("renyuan1==>"+taskPlanWithLeave.size());
+                }
+                //找到自己担任项目经理的项目,: is_task_plan==1 ,checkFirstId=自己的id 并且 task_status=3
+                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
+                if (!projectList.isEmpty()){
+                    List<Integer> projectIdList = projectList.stream().map(Project::getId).collect(Collectors.toList());
+                    projectIdList.add(-1);
+                    List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("project_id", projectIdList).isNotNull("executor_id"));
+                    List<String> collectUserIdList = executorList.stream().distinct().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
+                    collectUserIdList.add("-1");
+                    userIdsExtra.addAll(collectUserIdList);
+                    List<Map> getTaskPlanByProManager = projectMapper.getTaskPlanByProManager(collectUserIdList, startDate, endDate, user.getCompanyId(),user.getId(),targetUserId);
+                    for (Map map : getTaskPlanByProManager) {
+                        map.put("leaderOrManager",2);
+                    }
+                    System.out.println("renyuan2==>"+getTaskPlanByProManager.size());
+                    ganttData.addAll(getTaskPlanByProManager);
+                }
+
+                if (user.getRoleName().equals("区域经理&PM")){
+                    List<Task> taskList = taskService.list(new QueryWrapper<Task>().eq("check_second_id", user.getId()));
+                    List<Integer> taskIdList = taskList.stream().map(Task::getId).collect(Collectors.toList());
+                    taskIdList.add(-1);
+                    List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("task_id", taskIdList).isNotNull("executor_id"));
+                    List<String> collectUserIdList = executorList.stream().distinct().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
+                    collectUserIdList.add("-1");
+                    userIdsExtra.addAll(collectUserIdList);
+                    List<Map> getTaskPlanByProManager = projectMapper.getTaskPlanByAreaManager(collectUserIdList, startDate, endDate, user.getCompanyId(),user.getId(),targetUserId);
+                    for (Map map : getTaskPlanByProManager) {
+                        map.put("leaderOrManager",2);
+                    }
+                    System.out.println("renyuan3==>"+getTaskPlanByProManager.size());
+                    ganttData.addAll(getTaskPlanByProManager);
                 }
                 QueryWrapper<LeaveSheet> lsQueryWrapper=new QueryWrapper();
                 lsQueryWrapper.in("owner_id", userIds);
@@ -5111,39 +5087,37 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }
                 }
-                ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate ,endDate, user.getCompanyId(),groupName,taskType,user.getId(),justWaitForMe);
+                ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate ,endDate, user.getCompanyId(),groupName,taskType,user.getId());
                 System.out.println("ganttData1:"+ganttData.size());
-                if (user.getCompanyId()==Constant.MLD_COMPANY_ID){
-                    List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
-                    //是小组长
-                    if (!leaderList.isEmpty()){
-                        List<Integer> projectIdList = leaderList.stream().map(ProjectLeader::getProjectId).collect(Collectors.toList());
-                        projectIdList.add(-1);
-                        List<Map> taskPlanByGeneralMemb = projectMapper.getTaskPlanByProjectGeneralMemb(projectIdList,startDate ,endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId,justWaitForMe);
-                        System.out.println("ganttData2:"+taskPlanByGeneralMemb.size());
-                        ganttData.addAll(taskPlanByGeneralMemb);
-                    }
-                    //找到自己担任项目经理的项目,: is_task_plan==1 ,checkFirstId=自己的id 并且 task_status=3
-                    List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
-                    if (!projectList.isEmpty()){
-                        List<Integer> projectIdList = projectList.stream().map(Project::getId).collect(Collectors.toList());
-                        projectIdList.add(-1);
-                        List<Map> taskPlanByProjectManager = projectMapper.getTaskPlanByProjectManager(projectIdList,startDate ,endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId,justWaitForMe);
-                        System.out.println("ganttData2:"+taskPlanByProjectManager.size());
-                        ganttData.addAll(taskPlanByProjectManager);
-                    }
-
-                    if (user.getRoleName().equals("区域经理&PM")){
-                        List<Task> taskList = taskService.list(new QueryWrapper<Task>().eq("check_second_id", user.getId()));
-                        List<Integer> taskIdList = taskList.stream().map(Task::getId).collect(Collectors.toList());
-                        taskIdList.add(-1);
-                        List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("task_id", taskIdList).isNotNull("executor_id"));
-                        List<Integer> projectIdList = executorList.stream().distinct().map(TaskExecutor::getProjectId).collect(Collectors.toList());
-                        projectIdList.add(-1);
-                        List<Map> taskPlanByProjectAreaManager = projectMapper.getTaskPlanByProjectAreaManager(projectIdList, startDate, endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId,justWaitForMe);
-                        System.out.println("ganttData2:"+taskPlanByProjectAreaManager.size());
-                        ganttData.addAll(taskPlanByProjectAreaManager);
-                    }
+                List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
+                //是小组长
+                if (!leaderList.isEmpty()){
+                    List<Integer> projectIdList = leaderList.stream().map(ProjectLeader::getProjectId).collect(Collectors.toList());
+                    projectIdList.add(-1);
+                    List<Map> taskPlanByGeneralMemb = projectMapper.getTaskPlanByProjectGeneralMemb(projectIdList,startDate ,endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId);
+                    System.out.println("ganttData2:"+taskPlanByGeneralMemb.size());
+                    ganttData.addAll(taskPlanByGeneralMemb);
+                }
+                //找到自己担任项目经理的项目,: is_task_plan==1 ,checkFirstId=自己的id 并且 task_status=3
+                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
+                if (!projectList.isEmpty()){
+                    List<Integer> projectIdList = projectList.stream().map(Project::getId).collect(Collectors.toList());
+                    projectIdList.add(-1);
+                    List<Map> taskPlanByProjectManager = projectMapper.getTaskPlanByProjectManager(projectIdList,startDate ,endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId);
+                    System.out.println("ganttData2:"+taskPlanByProjectManager.size());
+                    ganttData.addAll(taskPlanByProjectManager);
+                }
+
+                if (user.getRoleName().equals("区域经理&PM")){
+                    List<Task> taskList = taskService.list(new QueryWrapper<Task>().eq("check_second_id", user.getId()));
+                    List<Integer> taskIdList = taskList.stream().map(Task::getId).collect(Collectors.toList());
+                    taskIdList.add(-1);
+                    List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().in("task_id", taskIdList).isNotNull("executor_id"));
+                    List<Integer> projectIdList = executorList.stream().distinct().map(TaskExecutor::getProjectId).collect(Collectors.toList());
+                    projectIdList.add(-1);
+                    List<Map> taskPlanByProjectAreaManager = projectMapper.getTaskPlanByProjectAreaManager(projectIdList, startDate, endDate, user.getCompanyId(),user.getId(),groupName,taskType,targetProjectId);
+                    System.out.println("ganttData2:"+taskPlanByProjectAreaManager.size());
+                    ganttData.addAll(taskPlanByProjectAreaManager);
                 }
                 QueryWrapper<BusinessTrip> btQueryWrapper =new QueryWrapper<>();
                 QueryWrapper<BustripProject> bpQueryWrapper =new QueryWrapper<>();
@@ -5163,13 +5137,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                 }
                 List<BustripProject> bustripProjectList = bustripProjectMapper.selectList(bpQueryWrapper);
-                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
+                List<Project> allProjectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
                 for(BusinessTrip businessTrip:businessTripList){
                     List<BustripProject> collect = bustripProjectList.stream().filter(bp -> bp.getBustripId().equals(businessTrip.getId())).collect(Collectors.toList());
                     for(BustripProject bustripProject:collect){
                         GanttDataItem curItem = new GanttDataItem();
                         if(bustripProject.getProjectId()!=null) {
-                            Project project = projectList.stream().filter(pro -> pro.getId().equals(bustripProject.getProjectId())).collect(Collectors.toList()).get(0);
+                            Project project = allProjectList.stream().filter(pro -> pro.getId().equals(bustripProject.getProjectId())).collect(Collectors.toList()).get(0);
                             if (!bustripProject.getProjectId().equals(btLastItemId)) {
                                 //抽取父级对象,项目名称
                                 GanttDataItem parent = new GanttDataItem();
@@ -8815,10 +8789,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> userIds = new ArrayList<>();
 
             List<Integer> proIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
-            if (Constant.MLD_COMPANY_ID==user.getCompanyId()){
-                List<Integer> projectSelect =projectMapper.getRelatedProjectIds(user.getId(), user.getCompanyId());
-                proIds.addAll(projectSelect);
-            }
+            List<Integer> projectSelect =projectMapper.getRelatedProjectIds(user.getId(), user.getCompanyId());
+            proIds.addAll(projectSelect);
 
             proIds.add(-1);
             List<Participation> pList = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", proIds));
@@ -12801,7 +12773,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 String lsLastItemId = null;
                 String btLastItemId = null;
                 //按人员获取
-                ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId(),user.getId(),null);
+                ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId(),user.getId());
                 QueryWrapper<LeaveSheet> lsQueryWrapper=new QueryWrapper();
                 lsQueryWrapper.in("owner_id", userIds);
                 if (startDate != null && endDate != null) {
@@ -12987,7 +12959,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }
                 }
-                ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate ,endDate, user.getCompanyId(),null,null,user.getId(),null);
+                ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate ,endDate, user.getCompanyId(),null,null,user.getId());
                 QueryWrapper<BusinessTrip> btQueryWrapper =new QueryWrapper<>();
                 QueryWrapper<BustripProject> bpQueryWrapper =new QueryWrapper<>();
                 btQueryWrapper.in("owner_id", userIds);

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/SysRoleServiceImpl.java

@@ -29,12 +29,12 @@ import java.util.stream.Collectors;
 @Transactional
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
 
-    public static String[] employeeModules =  {"工时报告","项目报告审核", "专业审核","部门审核","费用报销","待办任务", "项目管理", "请假管理", "导入日报审核"};
-    public static String[] pmModules =  {"工时报告","项目报告审核", "专业审核","部门审核","费用报销","待办任务", "项目管理", "请假管理", "导入日报审核"};
+    public static String[] employeeModules =  {"工时报告","项目报告审核", "专业审核","部门审核","费用报销","工作计划", "项目管理", "请假管理", "导入日报审核"};
+    public static String[] pmModules =  {"工时报告","项目报告审核", "专业审核","部门审核","费用报销","工作计划", "项目管理", "请假管理", "导入日报审核"};
     public static String[] financeModules =  {"工时成本统计", "财务核算成本", "费用报销", "组织架构", "请假管理"};
-    public static String[] pmoModules =  {"工时报告","项目报告审核","查看全部任务", "费用报销", "待办任务", "项目管理", "客户管理", "工程专业管理","请假管理"};
+    public static String[] pmoModules =  {"工时报告","项目报告审核","查看全部任务", "费用报销", "工作计划", "项目管理", "客户管理", "工程专业管理","请假管理"};
     public static String[] corpLeaderModules =  {"工时报告","查看全部任务","工时成本统计","自定义数值统计","财务核算成本","项目报表服务",
-            "费用报销","待办任务","项目管理","请假管理","查看全部报销单", "查看全部请假单"};
+            "费用报销","工作计划","项目管理","请假管理","查看全部报销单", "查看全部请假单"};
 
     public static final HashMap<String, String[]> moduleMaps = new HashMap();
     static {

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -1062,90 +1062,90 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
 
-        Task task = taskMapper.selectById(taskId);
-        if (!userId.equals(task.getCheckFirstId())&&!userId.equals(task.getCheckSecondId())){
-            msg.setError("当前人员不是审核人,不能审核");
-            return msg;
-        }
-        //通过
-        if (type){
-            //第一审核人通过
-            if (task.getIsTaskPlan()==1&&task.getTaskStatus()==3
-                    && StringUtils.isNotEmpty(task.getCheckFirstId())
-                    &&userId.equals(task.getCheckFirstId())){
-                task.setTaskStatus(4);
-                taskMapper.updateById(task);
-                //给第二审核人发送信息提醒
-                User owner = userMapper.selectById(task.getCheckSecondId());
-                Information information = new Information();
-                Project project = projectMapper.selectById(task.getProjectId());
-                information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
-                information.setTaskId(task.getId());
-                information.setUserId(owner.getId());
-                information.setType(11);
-                information.setTime(LocalDateTime.now());
-                informationMapper.insert(information);
-            }
-            //第二审核人通过
-            else if (task.getIsTaskPlan() == 1 && task.getTaskStatus() == 4
-                    && StringUtils.isNotEmpty(task.getCheckSecondId())
-                    && userId.equals(task.getCheckSecondId())) {
-
-                task.setTaskStatus(0);
-                task.setIsTaskPlan(0);
-                taskMapper.updateById(task);
-
-                List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", taskId));
-                if(CollectionUtils.isNotEmpty(taskExecutorList)){
-                    for (TaskExecutor taskExecutor : taskExecutorList) {
-                        //给任务的执行人发送信息提醒
-                        User owner = userMapper.selectById(taskExecutor.getExecutorId());
-                        Information information = new Information();
-                        information.setMsg("您有新的任务");
-                        information.setContent(taskExecutor.getProjectId()==null?null:(""+taskExecutor.getProjectId()));
-                        information.setType(1);
-                        information.setUserId(owner.getId());
-                        information.setTime(LocalDateTime.now());
-                        informationMapper.insert(information);
-                    }
-                }
-            }
-        }
-        //驳回
-        else {
-            //第一审核人驳回
-            if (task.getIsTaskPlan()==1&&task.getTaskStatus()==3
-                    && StringUtils.isNotEmpty(task.getCheckFirstId())
-                    &&userId.equals(task.getCheckFirstId())){
-                task.setTaskStatus(5);
-                taskMapper.updateById(task);
-                //给小组长发送信息提醒
-                User owner = userMapper.selectById(task.getCreaterId());
-                Information information = new Information();
-                information.setMsg("您有工作计划被驳回");
-                information.setType(11);
-                information.setUserId(owner.getId());
-                information.setTime(LocalDateTime.now());
-                informationMapper.insert(information);
-            }
-            //第二审核人驳回
-            else if (task.getIsTaskPlan() == 1 && task.getTaskStatus() == 4
-                    && StringUtils.isNotEmpty(task.getCheckSecondId())
-                    && userId.equals(task.getCheckSecondId())) {
-
-                task.setTaskStatus(6);
-                taskMapper.updateById(task);
-
-                //给小组长发送信息提醒
-                User owner = userMapper.selectById(task.getCreaterId());
-                Information information = new Information();
-                information.setMsg("您有工作计划被驳回");
-                information.setType(11);
-                information.setUserId(owner.getId());
-                information.setTime(LocalDateTime.now());
-                informationMapper.insert(information);
-            }
-        }
+//        Task task = taskMapper.selectById(taskId);
+//        if (!userId.equals(task.getCheckFirstId())&&!userId.equals(task.getCheckSecondId())){
+//            msg.setError("当前人员不是审核人,不能审核");
+//            return msg;
+//        }
+//        //通过
+//        if (type){
+//            //第一审核人通过
+//            if (task.getIsTaskPlan()==1&&task.getTaskStatus()==3
+//                    && StringUtils.isNotEmpty(task.getCheckFirstId())
+//                    &&userId.equals(task.getCheckFirstId())){
+//                task.setTaskStatus(4);
+//                taskMapper.updateById(task);
+//                //给第二审核人发送信息提醒
+//                User owner = userMapper.selectById(task.getCheckSecondId());
+//                Information information = new Information();
+//                Project project = projectMapper.selectById(task.getProjectId());
+//                information.setMsg(project.getProjectName()+"项目有新的预计FTE计划审批任务,请您查收.");
+//                information.setTaskId(task.getId());
+//                information.setUserId(owner.getId());
+//                information.setType(11);
+//                information.setTime(LocalDateTime.now());
+//                informationMapper.insert(information);
+//            }
+//            //第二审核人通过
+//            else if (task.getIsTaskPlan() == 1 && task.getTaskStatus() == 4
+//                    && StringUtils.isNotEmpty(task.getCheckSecondId())
+//                    && userId.equals(task.getCheckSecondId())) {
+//
+//                task.setTaskStatus(0);
+//                task.setIsTaskPlan(0);
+//                taskMapper.updateById(task);
+//
+//                List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", taskId));
+//                if(CollectionUtils.isNotEmpty(taskExecutorList)){
+//                    for (TaskExecutor taskExecutor : taskExecutorList) {
+//                        //给任务的执行人发送信息提醒
+//                        User owner = userMapper.selectById(taskExecutor.getExecutorId());
+//                        Information information = new Information();
+//                        information.setMsg("您有新的任务");
+//                        information.setContent(taskExecutor.getProjectId()==null?null:(""+taskExecutor.getProjectId()));
+//                        information.setType(1);
+//                        information.setUserId(owner.getId());
+//                        information.setTime(LocalDateTime.now());
+//                        informationMapper.insert(information);
+//                    }
+//                }
+//            }
+//        }
+//        //驳回
+//        else {
+//            //第一审核人驳回
+//            if (task.getIsTaskPlan()==1&&task.getTaskStatus()==3
+//                    && StringUtils.isNotEmpty(task.getCheckFirstId())
+//                    &&userId.equals(task.getCheckFirstId())){
+//                task.setTaskStatus(5);
+//                taskMapper.updateById(task);
+//                //给小组长发送信息提醒
+//                User owner = userMapper.selectById(task.getCreaterId());
+//                Information information = new Information();
+//                information.setMsg("您有工作计划被驳回");
+//                information.setType(11);
+//                information.setUserId(owner.getId());
+//                information.setTime(LocalDateTime.now());
+//                informationMapper.insert(information);
+//            }
+//            //第二审核人驳回
+//            else if (task.getIsTaskPlan() == 1 && task.getTaskStatus() == 4
+//                    && StringUtils.isNotEmpty(task.getCheckSecondId())
+//                    && userId.equals(task.getCheckSecondId())) {
+//
+//                task.setTaskStatus(6);
+//                taskMapper.updateById(task);
+//
+//                //给小组长发送信息提醒
+//                User owner = userMapper.selectById(task.getCreaterId());
+//                Information information = new Information();
+//                information.setMsg("您有工作计划被驳回");
+//                information.setType(11);
+//                information.setUserId(owner.getId());
+//                information.setTime(LocalDateTime.now());
+//                informationMapper.insert(information);
+//            }
+//        }
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/TaskTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.TaskType;
+import com.management.platform.mapper.TaskTypeMapper;
+import com.management.platform.service.TaskTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-05-12
+ */
+@Service
+public class TaskTypeServiceImpl extends ServiceImpl<TaskTypeMapper, TaskType> implements TaskTypeService {
+
+}

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -295,12 +295,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
                 //检测是否是项目审核人，有没有权限进行审核
                 userVO.setLeader(judgeIsLeader(userVO.getId()));
-
-                if(company.getId()==Constant.MLD_COMPANY_ID) {
-                    //检测项目角色
-                    userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
-                }
-
+                //检测项目角色
+                userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
                 userVO.setTimeType(timeTypeMapper.selectById(company.getId()));
                 List<Department> manageDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", userVO.getId()));
                 List<Integer> deptIds = manageDeptList.stream().map(Department::getDepartmentId).collect(Collectors.toList());
@@ -769,24 +765,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private int judgeIsProjectLeader(String userId,Integer companyId) {
         int LeaderCount = projectLeaderService.count(new QueryWrapper<ProjectLeader>().eq("leader_id", userId).eq("company_id", companyId));
-        int firstCheckCount = taskMapper.selectCount(
-                new QueryWrapper<Task>()
-                        .eq("company_id", companyId)
-                        .and(wrapper ->
-                                wrapper.eq("check_first_id", userId)
-                                        .or()
-                                        .eq("check_second_id", userId)
-                        )
-        );
-
-        if (LeaderCount>0&&firstCheckCount>0){
-            return 3;
-        }else if(LeaderCount > 0){
+        if(LeaderCount > 0){
             return 1;
-        } else if (firstCheckCount > 0) {
-            return 2;
-        }else return 0;
-
+        } else return 0;
     }
 
     //获取用户信息
@@ -2507,10 +2488,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //获取当前角色的权限菜单
         setUserRoleMenu(userVO);
 
-        if(company.getId()==Constant.MLD_COMPANY_ID) {
-            //检测项目角色
-            userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
-        }
+        //检测项目角色
+        userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
         httpRespMsg.data = userVO;
         return httpRespMsg;
     }
@@ -2808,23 +2787,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId() != Constant.MLD_COMPANY_ID) {
-            msg.setData(new ArrayList<User>());
-            return msg;
+        List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "项目经理"));
+        if (!sysRoles.isEmpty()) {
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>()
+                    .eq("company_id", user.getCompanyId())
+                    .eq("is_active", 1)
+                    .eq("role_id", sysRoles.get(0).getId()));
+            msg.setData(userList);
         } else {
-
-            List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "项目经理"));
-            if (!sysRoles.isEmpty()) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>()
-                        .eq("company_id", user.getCompanyId())
-                        .eq("is_active", 1)
-                        .eq("role_id", sysRoles.get(0).getId()));
-                msg.setData(userList);
-            } else {
-                msg.setData(new ArrayList<User>());
-            }
-            return msg;
+            msg.setData(new ArrayList<User>());
         }
+        return msg;
     }
 
     @Override
@@ -2832,23 +2805,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId() != Constant.MLD_COMPANY_ID) {
-            msg.setData(new ArrayList<User>());
-            return msg;
+        List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "区域经理&PM"));
+        if (!sysRoles.isEmpty()) {
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>()
+                    .eq("company_id", user.getCompanyId())
+                    .eq("is_active", 1)
+                    .eq("role_id", sysRoles.get(0).getId()));
+            msg.setData(userList);
         } else {
-
-            List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "区域经理&PM"));
-            if (!sysRoles.isEmpty()) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>()
-                        .eq("company_id", user.getCompanyId())
-                        .eq("is_active", 1)
-                        .eq("role_id", sysRoles.get(0).getId()));
-                msg.setData(userList);
-            } else {
-                msg.setData(new ArrayList<User>());
-            }
-            return msg;
+            msg.setData(new ArrayList<User>());
         }
+        return msg;
     }
 
     @Override

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10070
+  port: 10010
   tomcat:
     uri-encoding: utf-8
     max-http-form-post-size: -1

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/ProjectMapper.xml

@@ -743,7 +743,7 @@
     <select id="getTaskPlanByMemb" resultType="java.util.Map">
         SELECT user.`id` as user_id, user.`name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,task_executor.id as exe_id,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task_executor.plan_hours as duration, task.task_level as level ,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
         task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan
         FROM user
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
@@ -753,9 +753,6 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        <if test="justWaitForMe !=null  ">
-            and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId})  and (task.task_status=3 or task.task_status=4)
-        </if>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null and task.is_task_plan =0
         AND project.`status` = 1
@@ -764,8 +761,7 @@
 
     <select id="getTaskPlanByProject" resultType="java.util.Map">
         SELECT task.executor_id as user_id, task.executor_name as `name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId
-        ,task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task.plan_hours as duration FROM project
         LEFT JOIN task ON task.project_id = project.id
         <if test="groupName !=null and groupName !='' ">
@@ -784,35 +780,12 @@
         <if test="taskType !=null  ">
             and task.task_type = #{taskType}
         </if>
-        <if test="justWaitForMe !=null  ">
-            and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId})  and (task.task_status=3 or task.task_status=4)
-        </if>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null and task.task_plan =0
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
     </select>
 
-    <!--获取加班统计报表 -->
-    <!--    <select id="getOvertimeList" resultType="java.util.Map">-->
-    <!--        SELECT report.`creator_id` AS userId, user.`name` AS username, SUM(report.`working_time`) AS workingTime,-->
-    <!--        IFNULL(SUM(report.`overtime_hours`),0) AS overtimeHours,-->
-    <!--        group_concat(distinct(project.project_code)) as projectCode,-->
-    <!--        IFNULL(SUM(report.overtime_cost), 0) AS cost FROM report LEFT JOIN user ON user.id = report.`creator_id`-->
-    <!--        left join project on project.id = report.project_id-->
-    <!--        WHERE report.is_overtime = 1-->
-    <!--        and report.`state` = 1-->
-    <!--        AND report.`create_date` BETWEEN #{startDate} and #{endDate}-->
-    <!--        AND user.`company_id` = #{companyId}-->
-    <!--        <if test="projectId != null">-->
-    <!--            AND report.`project_id` = #{projectId}-->
-    <!--        </if>-->
-    <!--        <if test="userId != null">-->
-    <!--            AND report.`creator_id` = #{userId}-->
-    <!--        </if>-->
-    <!--        GROUP BY report.creator_id-->
-    <!--    </select>-->
-
     <!-- 获取某个员工的某时间段内的加班详情 -->
     <select id="getOvertimeDetail" resultType="java.util.Map">
         SELECT report.id AS reportId,date_format(report.`create_date`, '%Y-%m-%d') AS createDate,
@@ -2736,7 +2709,7 @@
     <select id="getTaskPlanByGeneralMemb" resultType="java.util.Map">
         SELECT user.`id` as user_id, user.`name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,task_executor.id as exe_id,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task_executor.plan_hours as duration, task.task_level as level ,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
         task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan
         FROM user
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
@@ -2751,16 +2724,13 @@
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>
-        <if test="justWaitForMe !=null  ">
-            and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId})  and (task.task_status=3 or task.task_status=4)
-        </if>
         AND project.`status` = 1 and task.task_plan=1
         ORDER BY user.id, task.start_date
     </select>
     <select id="getTaskPlanWithLeave" resultType="java.util.Map">
         SELECT user.`id` as user_id, user.`name`,task.id as task_id, task.name as task_name,task_executor.id as exe_id,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task_executor.plan_hours as duration, task.task_level as level ,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
         task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan
         FROM user
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
@@ -2776,7 +2746,7 @@
     <select id="getTaskPlanByProManager" resultType="java.util.Map">
         SELECT user.`id` as user_id, user.`name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,task_executor.id as exe_id,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task_executor.plan_hours as duration, task.task_level as level ,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
         task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan
         FROM user
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
@@ -2787,20 +2757,17 @@
             #{item}
         </foreach>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
-        and task.end_date is not null and task.is_task_plan=1  and task.check_first_id=#{managerId}
+        and task.end_date is not null and task.is_task_plan=1  and project.incharger_id=#{managerId}
         AND project.`status` = 1 and task.task_plan=1 and task.task_status !=2
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>
-        <if test="justWaitForMe !=null">
-            and task.task_status=3
-        </if>
         ORDER BY user.id, task.start_date
     </select>
     <select id="getTaskPlanByAreaManager" resultType="java.util.Map">
         SELECT user.`id` as user_id, user.`name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,task_executor.id as exe_id,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task_executor.plan_hours as duration, task.task_level as level ,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
         task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan
         FROM user
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
@@ -2816,15 +2783,12 @@
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>
-        <if test="justWaitForMe !=null">
-            and task.task_status=4
-        </if>
         ORDER BY user.id, task.start_date
     </select>
     <select id="getTaskPlanByProjectGeneralMemb" resultType="java.util.Map">
         SELECT task.executor_id as user_id, task.executor_name as `name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId
-        ,task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
+        task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task.plan_hours as duration FROM project
         LEFT JOIN task ON task.project_id = project.id
         <if test="groupName !=null and groupName !='' ">
@@ -2846,9 +2810,6 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        <if test="justWaitForMe !=null">
-            and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId}) and (task.task_status=3 or task.task_status=4)
-        </if>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null
         AND project.`status` = 1
@@ -2856,8 +2817,8 @@
     </select>
     <select id="getTaskPlanByProjectManager" resultType="java.util.Map">
         SELECT task.executor_id as user_id, task.executor_name as `name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId
-        ,task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
+        task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task.plan_hours as duration FROM project
         LEFT JOIN task ON task.project_id = project.id
         <if test="groupName !=null and groupName !='' ">
@@ -2879,18 +2840,15 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        <if test="justWaitForMe !=null">
-            and task.task_status=3
-        </if>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
-        and task.end_date is not null and task.is_task_plan=1  and task.check_first_id=#{managerId} and task.task_status !=2
+        and task.end_date is not null and task.is_task_plan=1  and project.incharger_id=#{managerId} and task.task_status !=2
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
     </select>
     <select id="getTaskPlanByProjectAreaManager" resultType="java.util.Map">
         SELECT task.executor_id as user_id, task.executor_name as `name`,project.id, project.`project_name`,task.id as task_id, task.name as task_name,
-        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,task.check_first_id as checkFirstId,task.check_second_id as checkSecondId
-        ,task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
+        task.task_plan_type as taskPlanType,task.is_task_plan as isTaskPlan,
+        task.task_status as taskStatus,task.id as taskId,task.task_plan taskPlan,
         IFNULL(task.`start_date`, task.end_date) as start_date, task.`end_date`, task.plan_hours as duration FROM project
         LEFT JOIN task ON task.project_id = project.id
         <if test="groupName !=null and groupName !='' ">
@@ -2912,9 +2870,6 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        <if test="justWaitForMe !=null">
-            and task.task_status=4
-        </if>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null and task.task_plan=1 and  task.check_second_id=#{managerId}
         AND project.`status` = 1 and task.task_status !=2
@@ -2970,14 +2925,13 @@
         SELECT DISTINCT pl.project_id
         FROM project_leader pl
         WHERE pl.leader_id = #{userId}
-
         UNION
-
         SELECT DISTINCT p.id
         FROM project p
         INNER JOIN task t ON t.project_id = p.id
+        LEFT JOIN task_executor te ON te.task_id = t.id
         WHERE p.company_id = #{companyId}
-        AND (t.check_first_id = #{userId} OR t.check_second_id = #{userId})
+        AND (te.first_auditor_id = #{userId} OR te.second_auditor_id = #{userId})
     </select>
     <select id="getExistIds" resultType="java.lang.String">
         select project_code

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/TaskExecutorMapper.xml

@@ -13,11 +13,15 @@
         <result column="project_id" property="projectId" />
         <result column="service_id" property="serviceId" />
         <result column="real_cost" property="realCost" />
+        <result column="file_charge_one_id" property="fileChargeOneId" />
+        <result column="file_charge_two_id" property="fileChargeTwoId" />
+        <result column="first_auditor_id" property="firstAuditorId" />
+        <result column="second_auditor_id" property="secondAuditorId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, task_id, executor_id, executor_name, executor_color, plan_hours, project_id, service_id, real_cost, file_charge_one_id, file_charge_two_id
+        id, task_id, executor_id, executor_name, executor_color, plan_hours, project_id, service_id, real_cost, file_charge_one_id, file_charge_two_id, first_auditor_id, second_auditor_id
     </sql>
     <select id="getInfoWithFileCharge" resultType="com.management.platform.entity.TaskExecutor">
         select te.id as id,   task_id, executor_id, executor_name, executor_color, plan_hours, project_id
@@ -29,5 +33,4 @@
                  left join user u2 on te.file_charge_two_id = u2.id
         where task_id = #{taskId}
     </select>
-
 </mapper>

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/TaskMapper.xml

@@ -37,12 +37,9 @@
         <result column="task_plan_type" property="taskPlanType" />
         <result column="task_plan" property="taskPlan" />
         <result column="is_task_plan" property="isTaskPlan" />
-        <result column="check_first_id" property="checkFirstId" />
-        <result column="check_second_id" property="checkSecondId" />
         <result column="center_id" property="centerId" />
         <result column="center_name" property="centerName" />
     </resultMap>
-
     <resultMap id="timeResultMap" type="com.management.platform.entity.TimeTask" >
         <id column="id" property="id" />
         <result column="name" property="name" />
@@ -110,9 +107,51 @@
         <result column="center_id" property="centerId" />
         <result column="center_name" property="centerName" />
     </resultMap>
+    <resultMap id="AuditorResultMap" type="com.management.platform.entity.TaskWithAuditor">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="task_desc" property="taskDesc" />
+        <result column="creater_id" property="createrId" />
+        <result column="creater_name" property="createrName" />
+        <result column="creator_color" property="creatorColor" />
+        <result column="executor_id" property="executorId" />
+        <result column="executor_name" property="executorName" />
+        <result column="executor_color" property="executorColor" />
+        <result column="task_level" property="taskLevel" />
+        <result column="task_status" property="taskStatus" />
+        <result column="create_date" property="createDate" />
+        <result column="end_date" property="endDate" />
+        <result column="project_id" property="projectId" />
+        <result column="stages_id" property="stagesId" />
+        <result column="company_id" property="companyId" />
+        <result column="indate" property="indate" />
+        <result column="parent_tid" property="parentTid" />
+        <result column="group_id" property="groupId" />
+        <result column="seq" property="seq" />
+        <result column="plan_hours" property="planHours" />
+        <result column="task_type" property="taskType" />
+        <result column="parent_tname" property="parentTname" />
+        <result column="finish_date" property="finishDate" />
+        <result column="project_name" property="projectName" />
+        <result column="start_date" property="startDate" />
+        <result column="meeting_id" property="meetingId" />
+        <result column="ahead_tid" property="aheadTid" />
+        <result column="sap_task_code" property="sapTaskCode" />
+        <result column="stages_name" property="stagesName" />
+        <result column="department_name" property="departmentName" />
+        <result column="attach_file_required" property="attachFileRequired" />
+        <result column="center_id" property="centerId" />
+        <result column="center_name" property="centerName" />
+        <result column="first_auditor_id" property="firstAuditorId" />
+        <result column="first_auditor_name" property="firstAuditorName" />
+        <result column="second_auditor_id" property="secondAuditorId" />
+        <result column="second_auditor_name" property="secondAuditorName" />
+    </resultMap>
+
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, task_desc, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date, start_date, meeting_id, ahead_tid, sap_task_code, plan_cost, attach_file_required, task_plan_type, task_plan, is_task_plan, check_first_id, check_second_id, center_id, center_name
+        id, name, task_desc, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date, start_date, meeting_id, ahead_tid, sap_task_code, plan_cost, attach_file_required, task_plan_type, task_plan, is_task_plan, center_id, center_name
     </sql>
     <select id="simpleList" resultMap="BaseResultMap">
         select id, name, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date, start_date
@@ -280,7 +319,7 @@
             </foreach>
         </if>
     </select>
-    <select id="getTaskWithProjectName" resultMap="RichResultMap">
+    <select id="getTaskWithProjectName" resultMap="AuditorResultMap">
         SELECT task.id, task.project_id, task.name, task.executor_name, task.start_date, task.`end_date`,task.create_date, task.`creater_id`, task.`creater_name`, task.group_id,
         task.plan_hours, task.task_type, task.task_level, task.task_status, task.`finish_date`, project.`project_name`, stages.stages_name,department.department_name
         <!-- ,task.charge_one_id,task.charge_one_status,task.charge_two_id,task.charge_two_status,task.charge_stage,task.final_charge_status -->
@@ -798,4 +837,16 @@
         </where>
         ) tmp1
     </select>
+
+    <select id="getMyAuditTaskList"
+            resultMap="AuditorResultMap">
+        SELECT DISTINCT task.*, task_executor.`first_auditor_id`, task_executor.`second_auditor_id`, u1.name AS first_auditor_name, u2.`name` AS second_auditor_name FROM task LEFT JOIN task_executor ON task.id = task_executor.`task_id`
+        LEFT JOIN USER u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN USER u2 ON u2.id = task_executor.`second_auditor_id`
+        ${ew.customSqlSegment}
+        and (task.`task_status` = 3 AND task_executor.`first_auditor_id` = #{userId} ) or (task.`task_status` = 4 AND task_executor.`second_auditor_id` = #{userId} )
+        order by task.id desc
+        <if test="pageStart != null and pageSize != null">
+            limit #{pageStart}, #{pageSize}
+        </if>
+    </select>
 </mapper>

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/TaskTypeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.TaskTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.TaskType">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="need_audit" property="needAudit" />
+        <result column="company_id" property="companyId" />
+        <result column="color" property="color" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, need_audit, company_id, color
+    </sql>
+
+</mapper>