fix: plan page

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

@@ -222,8 +222,16 @@ public class SysImplementPlanManager {
         List<Tree<Integer>> builds = new ArrayList<>();
         // 事业部 || 区域 || 平台
         if (entLevel == 0 || entLevel == 1 || entLevel == -1) {
-            List<Tree<Integer>> build = TreeUtil.build(toPages, 0);
-            builds.addAll(build);
+
+            if (UpmsState.ImplementPlanActionState.AWAIT_2_OM.equals(query.getActionState())) {
+                for (TreeNode<Integer> node : toPages) {
+                    List<Tree<Integer>> build = TreeUtil.build(Collections.singletonList(node), node.getParentId());
+                    builds.addAll(build);
+                }
+            } else {
+                List<Tree<Integer>> build = TreeUtil.build(toPages, 0);
+                builds.addAll(build);
+            }
         }
         // 服务商
         else {
@@ -336,35 +344,58 @@ public class SysImplementPlanManager {
                 visibleEntIds.addAll(entIds);
             }
 
-            wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
-                    .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
-                    // .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
-                    .eq(SysImplementPlan::getParentId, 0);
+            // wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+            //         .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+            //         // .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
+            //         .eq(SysImplementPlan::getParentId, 0);
 
 
             // 拼装状态
             if (Objects.nonNull(actionState)) {
                 switch (actionState) {
                     case AWAIT_2_LEADER:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.INIT).eq(SysImplementPlan::getParentId, 0);
+                        wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                                .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                                .eq(SysImplementPlan::getParentId, 0)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.INIT);
                         break;
                     case AWAIT_2_OM:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.INIT).ne(SysImplementPlan::getParentId, 0);
+                        wrapper.in(SysImplementPlan::getConsignorId, visibleEntIds)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.INIT)
+                                .ne(SysImplementPlan::getParentId, 0);
                         break;
                     case PASSED_AND_GO:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED).apply("plan_score != avail_score");
+                        wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                                .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                                .eq(SysImplementPlan::getParentId, 0)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED)
+                                .apply("plan_score != avail_score");
                         break;
                     case PASSED_TO_GO:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED).apply("plan_score = avail_score");
-                        ;
+                        wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                                .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                                .eq(SysImplementPlan::getParentId, 0)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED)
+                                .apply("plan_score = avail_score");
                         break;
                     case REJECTED:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.REJECTED);
+                        wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                                .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                                .eq(SysImplementPlan::getParentId, 0)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.REJECTED);
                         break;
                     case IN_PROGRESS:
-                        wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.IN_PROGRESS);
+                        wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                                .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                                .eq(SysImplementPlan::getParentId, 0)
+                                .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.IN_PROGRESS);
                         break;
                 }
+            } else {
+                wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                        .in(CollUtil.isNotEmpty(visibleEntIds), SysImplementPlan::getConsigneeId, visibleEntIds)
+                        // .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
+                        .eq(SysImplementPlan::getParentId, 0);
             }
 
         }
@@ -384,7 +415,7 @@ public class SysImplementPlanManager {
             boolean ignoredFlag = (userId == 7959 || userId == 7602 || userId == 7414 || userId == 7415);
             wrapper.eq(SysImplementPlan::getParentId, 0)
                     .notIn(ignoredFlag, SysImplementPlan::getConsignorId, ignored);
-                    // .notIn(ignoredFlag, SysImplementPlan::getConsigneeId, ignored);
+            // .notIn(ignoredFlag, SysImplementPlan::getConsigneeId, ignored);
         }
 
         if (ArrayUtil.isNotEmpty(period) && period.length == 2) {