init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1011,13 +1011,13 @@ public class SysUserController {
             return R.ok(answerList);
         } else {
             page.setSize(10000);
-            List<Integer> list = new ArrayList<>();
+            List<Integer> list = new ArrayList<>(2);
             list.add(5);
             list.add(6);
             userDTO.setRole(list);
 
             List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
-            List<Map<String, Object>> answerList = new ArrayList<>();
+            List<Map<String, Object>> answerList = new ArrayList<>(sysUserList.size());
             if (CollUtil.isNotEmpty(sysUserList)) {
                 for (UserVO sysUser : sysUserList) {
                     Map<String, Object> map = new HashMap<>(3);

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

@@ -84,6 +84,7 @@ public class SysCheckChainManager {
         // 封装初始化结果
         Map<Integer, Map<String, Object>> res = new HashMap<>(targetIds.size());
         for (Integer tid : targetIds) {
+            log.info("当前target_info:<--{}-->", tid);
 
             Boolean checkResult = null;
             String checkMsg = null;
@@ -100,16 +101,16 @@ public class SysCheckChainManager {
 
                 // 最新的审核结果（当前级别）
                 SysCheckChainNodeCheckHistory history = histories.get(0);
-
+                log.info("当前审核节点信息:<--{}-->", history);
                 nodeId = history.getNodeId();
 
-                if (nodeId == 1 ) {
+                if (nodeId == 1) {
                     checkResult = history.getCheckResult();
                     checkMsg = history.getCheckMsg();
                     displayInfo = nodeMap.get(2).getDisplayInfo();
                     curNodeId = nodeId;
                     nextNodeId = nodeMap.get(1).getNextNodeId();
-                    roleId = nodeMap.get(1).getExecRoleId();
+                    roleId = nodeMap.get(2).getExecRoleId();
 
                 } else if (nodeId == 2) {
                     checkResult = history.getCheckResult();
@@ -117,7 +118,7 @@ public class SysCheckChainManager {
                     displayInfo = nodeMap.get(3).getDisplayInfo();
                     curNodeId = nodeId;
                     nextNodeId = nodeMap.get(2).getNextNodeId();
-                    roleId = nodeMap.get(2).getExecRoleId();
+                    roleId = nodeMap.get(3).getExecRoleId();
 
                 } else if (nodeId == 3) {
                     checkResult = history.getCheckResult();
@@ -125,17 +126,30 @@ public class SysCheckChainManager {
                     displayInfo = nodeMap.get(4).getDisplayInfo();
                     curNodeId = nodeId;
                     nextNodeId = nodeMap.get(3).getNextNodeId();
+                    // 事业组审核
                     roleId = nodeMap.get(3).getExecRoleId();
 
-                } else if (nodeId == 5) {
+                }
+                // 服务组
+                else if (nodeId == 4) {
+                    checkResult = history.getCheckResult();
+                    checkMsg = history.getCheckMsg();
+                    displayInfo = nodeMap.get(4).getDisplayInfo();
+                    curNodeId = nodeId;
+                    roleId = -1;
+                }
+                // 分管领导
+                else if (nodeId == 5) {
                     checkResult = history.getCheckResult();
                     checkMsg = history.getCheckMsg();
                     displayInfo = nodeMap.get(6).getDisplayInfo();
                     curNodeId = nodeId;
                     nextNodeId = nodeMap.get(5).getNextNodeId();
-                    roleId = nodeMap.get(5).getExecRoleId();
+                    roleId = nodeMap.get(6).getExecRoleId();
 
-                } else if (nodeId == 6) {
+                }
+                // 总经理
+                else if (nodeId == 6) {
                     checkResult = history.getCheckResult();
                     checkMsg = history.getCheckMsg();
                     displayInfo = nodeMap.get(6).getDisplayInfo();
@@ -153,11 +167,11 @@ public class SysCheckChainManager {
                         checkMsg = history.getCheckMsg();
                         curNodeId = nodeId;
                         nextNodeId = 5;
-                        roleId = nodeMap.get(nodeId).getExecRoleId();
+                        roleId = nodeMap.get(5).getExecRoleId();
                     }
                     // 等待服务组审批
                     else {
-                        displayInfo = nodeMap.get(9).getDisplayInfo();
+                        displayInfo = nodeMap.get(8).getDisplayInfo();
                         checkResult = history.getCheckResult();
                         checkMsg = history.getCheckMsg();
                         curNodeId = nodeId;
@@ -174,7 +188,7 @@ public class SysCheckChainManager {
                         checkMsg = history.getCheckMsg();
                         curNodeId = nodeId;
                         displayInfo = nodeMap.get(5).getDisplayInfo();
-                        roleId = nodeMap.get(nodeId).getExecRoleId();
+                        roleId = nodeMap.get(5).getExecRoleId();
                     }
                     // 等待市场组审批
                     else {
@@ -182,7 +196,7 @@ public class SysCheckChainManager {
                         checkResult = history.getCheckResult();
                         checkMsg = history.getCheckMsg();
                         curNodeId = nodeId;
-                        displayInfo = nodeMap.get(8).getDisplayInfo();
+                        displayInfo = nodeMap.get(9).getDisplayInfo();
                         roleId = nodeMap.get(8).getExecRoleId();
                     }
 
@@ -191,6 +205,9 @@ public class SysCheckChainManager {
             }
             // 不存在审核记录的时候初始化
             else {
+
+                log.info("初始化尚未审核的目标任务");
+
                 checkMsg = "";
                 nextNodeId = 1;
                 curNodeId = 1;