feat：supervision v3.6

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsState.java

@@ -170,7 +170,7 @@ public class UpmsState {
         INIT("INIT", "待部门负责人审核"),
         CKT1("CKT1", "待分管领导审核"),
         CKT2("CKT2", "待人用疫苗事业部总经理审核"),
-        REJECTED("REJECTED", "拒绝"),
+        // REJECTED("REJECTED", "拒绝"),
         PASSED("PASSED", "通过"),
         ;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -19,6 +19,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSupervision;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSupervisionAdvice;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmWarnUserRelation;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
@@ -1040,7 +1041,7 @@ public class WmSupervisionManager {
                     Set<Integer> ckt1 = collect1.getOrDefault(UpmsState.TaskSupervisionState.CKT1, Collections.emptySet());
                     Set<Integer> ckt2 = collect1.getOrDefault(UpmsState.TaskSupervisionState.CKT2, Collections.emptySet());
                     Set<Integer> passed = collect1.getOrDefault(UpmsState.TaskSupervisionState.PASSED, Collections.emptySet());
-                    Set<Integer> rejected = collect1.getOrDefault(UpmsState.TaskSupervisionState.REJECTED, Collections.emptySet());
+                    // Set<Integer> rejected = collect1.getOrDefault(UpmsState.TaskSupervisionState.REJECTED, Collections.emptySet());
 
                     // 负责人
                     if (CollUtil.containsAny(roles, List.of(57, 58, 59, 60))) {
@@ -1137,10 +1138,13 @@ public class WmSupervisionManager {
 
             if (review) {
                 // 获取当前积分包已经监督过的任务ID
-                Set<Integer> supTaskIds = list.stream().filter(ts -> StrUtil.equals(user.getUsername(), ts.getCreateBy())).mapToInt(WmTaskSupervision::getTaskId).boxed().collect(Collectors.toSet());
-                if (CollUtil.isEmpty(supTaskIds)) {
+
+                Set<Long> tsId = taskSupervisionAdviceService.list(Wrappers.<WmTaskSupervisionAdvice>lambdaQuery().eq(WmTaskSupervisionAdvice::getCreateBy, user.getUsername())).stream().mapToLong(WmTaskSupervisionAdvice::getTaskSupervisionId).boxed().collect(Collectors.toSet());
+
+                if (CollUtil.isEmpty(tsId)) {
                     return page;
                 }
+                Set<Integer> supTaskIds = list.stream().filter(ts -> tsId.contains(ts.getSupervisionId())).mapToInt(WmTaskSupervision::getTaskId).boxed().collect(Collectors.toSet());
                 taskPage = taskService.page(new Page<>(query.getCurrent(), query.getSize()), Wrappers.<WmTask>lambdaQuery().in(WmTask::getId, supTaskIds));
             } else {
                 Map<UpmsState.TaskSupervisionState, Set<Integer>> collect1 = list.stream()
@@ -1151,26 +1155,29 @@ public class WmSupervisionManager {
                 Set<Integer> ckt1 = collect1.get(UpmsState.TaskSupervisionState.CKT1);
                 Set<Integer> ckt2 = collect1.get(UpmsState.TaskSupervisionState.CKT2);
                 Set<Integer> passed = collect1.get(UpmsState.TaskSupervisionState.PASSED);
-                Set<Integer> rejected = collect1.get(UpmsState.TaskSupervisionState.REJECTED);
+                // Set<Integer> rejected = collect1.get(UpmsState.TaskSupervisionState.REJECTED);
 
                 // 负责人
                 List<Integer> supTaskIds;
                 if (CollUtil.containsAny(roles, List.of(57, 58, 59, 60))) {
 
-                    Set<Integer> temp = CollUtil.unionDistinct(ckt1, rejected);
-                    supTaskIds = CollUtil.subtractToList(init, temp);
+                    // Set<Integer> temp = CollUtil.unionDistinct(ckt1, rejected);
+                    // supTaskIds = CollUtil.subtractToList(init, temp);
+                    supTaskIds = CollUtil.subtractToList(init, ckt1);
 
                 }
                 // 分管领导
                 else if (CollUtil.containsAny(roles, List.of(51, 54, 55, 61))) {
-                    Set<Integer> temp = CollUtil.unionDistinct(ckt2, rejected);
-                    supTaskIds = CollUtil.subtractToList(ckt1, temp);
+                    // Set<Integer> temp = CollUtil.unionDistinct(ckt2, rejected);
+                    // supTaskIds = CollUtil.subtractToList(ckt1, temp);
+                    supTaskIds = CollUtil.subtractToList(ckt1, ckt2);
 
                 }
                 // 事业部总经理
                 else if (CollUtil.containsAny(roles, List.of(39))) {
-                    Set<Integer> temp = CollUtil.unionDistinct(passed, rejected);
-                    supTaskIds = CollUtil.subtractToList(ckt2, temp);
+                    // Set<Integer> temp = CollUtil.unionDistinct(passed, rejected);
+                    // supTaskIds = CollUtil.subtractToList(ckt2, temp);
+                    supTaskIds = CollUtil.subtractToList(ckt2, passed);
                 } else {
                     throw new BizException("无监督权限");
                 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskSupervisionServiceImpl.java

@@ -77,7 +77,7 @@ public class WmTaskSupervisionServiceImpl extends ServiceImpl<WmTaskSupervisionM
     @Transactional(rollbackFor = Exception.class)
     public void updateSupervision(Long supervisionId, Boolean modifiable, HnqzUser operator) {
 
-        UpmsState.TaskSupervisionState state = UpmsState.TaskSupervisionState.REJECTED;
+        UpmsState.TaskSupervisionState state = UpmsState.TaskSupervisionState.INIT;
         if (!modifiable) {
             List<Integer> roles = SecurityUtils.getRoles();