Jelajahi Sumber

提交代码,审核类型为9时获取参与分组要过滤

seyason 8 bulan lalu
induk
melakukan
3d511ddc37

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -507,7 +507,7 @@ public class TaskGroupController {
         if (isSubstitude == 1) {
             msg.data = taskGroupService.list(queryWrapper);
         } else {
-            if (timeType.getReportAuditType() == 1 || timeType.getReportAuditType() == 2) {
+            if (timeType.getReportAuditType() == 1 || timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
                 List<GroupParticipator> groupParticipatorList = groupParticipatorMapper.selectList(new QueryWrapper<GroupParticipator>().eq("user_id", token));
                 if (groupParticipatorList.size() > 0) {
                     List<Integer> groupIds = groupParticipatorList.stream().map(GroupParticipator::getGroupId).collect(Collectors.toList());

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

@@ -4115,7 +4115,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         int oldState = oneReport.getState();
         int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
         List<Report> rList = reportMapper.selectList(new QueryWrapper<Report>().select("id, group_id, project_id, creator_id, create_date").in("id", ListUtil.convertIdsArrayToList(reportIds)));
-        if (timeTypeMapper.selectById(company.getId()).getReportAuditType() == 2) {
+        TimeType timeType = timeTypeMapper.selectById(company.getId());
+        if (timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
             //退回任务分组审核状态
             List<Report> newList = new ArrayList<>();
             for (Report r : rList) {
@@ -6862,7 +6863,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             .setRejectReason(reason).setRejectUserid(user.getId()).setRejectUsername(user.getName()),
                     eq);
 
-            if (timeTypeMapper.selectById(company.getId()).getReportAuditType() == 2) {
+            TimeType timeType = timeTypeMapper.selectById(company.getId());
+            if (timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
                 List<Report> rList = list;
                 //退回任务分组审核状态
                 List<Report> newList = new ArrayList<>();