修改日报填报时加载的任务，手机端待办任务消息点击跳转

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

@@ -518,7 +518,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<SubProject> subProjectList = integerList.size() > 0?subProjectMapper.selectList(new QueryWrapper<SubProject>().in("project_id",integerList)):new ArrayList<>();
             List<ProjectAuditor> auditorList = integerList.size() > 0?projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().in("project_id", integerList)): new ArrayList<>();
 
-            List<UserRecentTask> taskList = integerList.size() > 0?userRecentTaskMapper.selectList(new QueryWrapper<UserRecentTask>().in("project_id", integerList).orderByDesc("id")):new ArrayList<>();
+            ;
+
+//            List<UserRecentTask> taskList = integerList.size() > 0?userRecentTaskMapper.selectList(new QueryWrapper<UserRecentTask>().in("project_id", integerList).orderByDesc("id")):new ArrayList<>();
             List<Profession> professions = professionMapper.selectList(new QueryWrapper<Profession>().eq("company_id", companyId));
 
             List<ReportExtraDegree> degreeList = reportExtraDegreeMapper.selectList(new QueryWrapper<ReportExtraDegree>().eq("company_id", companyId));
@@ -527,7 +529,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //获取当前项目的子项目列表，任务分组，任务列表，项目相关维度列表
             reports.forEach(r->{
                 r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-                r.setTaskList(taskList.stream().filter(t->t.getProjectId().equals(r.getProjectId()) && t.getUserId().equals(r.getCreatorId())).collect(Collectors.toList()));
+                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId));
                 //获取当前项目的工程专业进度
                 List<ReportProfessionProgress> progressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().eq("report_id", r.getId()));
                 //去掉当前项目上已经不存在的专业
@@ -2912,7 +2914,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //管理员可以撤销任何状态的
                 cnt += reportMapper.update(report, new QueryWrapper<Report>().eq("id", reportId));
             }
-
+            Report oneReport = reportMapper.selectById(reportId);
+            if (oneReport.getTaskId() != null) {
+                Task task = taskMapper.selectById(oneReport.getTaskId());
+                if (task != null && task.getTaskStatus() == 1) {
+                    //撤销时要把任务重启
+                    Task upTask = new Task();
+                    upTask.setId(task.getId());
+                    upTask.setTaskStatus(0);
+                    taskMapper.updateById(upTask);
+                }
+            }
         }
         if (cnt == 0) {
             //msg.setError("只有待审核状态的报告才能撤回");

fhKeeper/formulahousekeeper/timesheet_h5/src/views/msg/index.vue

@@ -80,6 +80,10 @@
                     .then(res => {
                         if(res.code == "ok") {
                             this.getMessage()
+                            if (item.type == 1 || (item.msg != null && item.msg.indexOf('任务') > 0)) {
+                                //跳到待办任务上
+                                this.$router.push('/task'); 
+                            } 
                         } 
                     }).catch(err=> {this.$toast.clear();});
                 }