更新

src/main/java/com/keymobile/rest/controller/ExcelController.java

@@ -71,33 +71,32 @@ public class ExcelController {
         Map vars = new HashMap<>();
 
         if (template.getNeedAudit() == Template.NEED_AUDIT) {
-            vars.put("NeedDataAudit", true);
+            vars.put(CtrlConstant.ACT_NEED_DATA_AUDIT, true);
             Map audit = feignAuthService.getUserById(template.getAuditId());
             CommonValidator.notNull(audit, "模板审核人不存在");
-            vars.put("auditUser", audit.get("name").toString());
+            vars.put(CtrlConstant.ACT_AUDIT_USER, audit.get("name").toString());
         } else {
-            vars.put("NeedDataAudit", false);
+            vars.put(CtrlConstant.ACT_NEED_DATA_AUDIT, false);
 
             String executionId = task.getExecutionId();
             // 总的会签任务数量
             int nrOfInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfInstances").toString());
             // 当前获取的会签任务数量
-            int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
+//            int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
             // 已经完成的会签任务数量
             int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
             Activity activity = process.getActivity();
-
             if (nrOfCompletedInstances == nrOfInstances - 1) {
                 if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
-                    vars.put("NeedConfirm", true);
-                    vars.put("manager", CtrlConstant.USER_NAME_MANAGER);
+                    vars.put(CtrlConstant.ACT_NEED_CONFIRM, true);
+                    vars.put(CtrlConstant.ACT_MANAGER, CtrlConstant.USER_NAME_MANAGER);
                 } else {
-                    vars.put("NeedConfirm", false);
+                    vars.put(CtrlConstant.ACT_NEED_CONFIRM, false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
-//                    vars.put("NeedDataBack", true);
-//                    vars.put("backFlowUser", "");
+//                    vars.put(CtrlConstant.ACT_NEED_DATA_BACK_FLOW, true);
+//                    vars.put(CtrlConstant.ACT_BACK_FLOW_USER, "");
 //                } else {
-                    vars.put("NeedDataBack", false);
+                    vars.put(CtrlConstant.ACT_NEED_DATA_BACK_FLOW, false);
                     // 流程完
 //                }
                 }

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -256,7 +256,7 @@ public class TaskController {
         CommonValidator.notNull(task, "任务不存在");
         boolean pass = status == CtrlConstant.STATUS_PASS;
         Map vars = new HashMap();
-        vars.put("DataAudit", pass);
+        vars.put(CtrlConstant.ACT_SIGN_DATA_AUDIT, pass);
         if (pass) {
             String executionId = task.getExecutionId();
             // 总的会签任务数量
@@ -270,15 +270,15 @@ public class TaskController {
             Activity activity = process.getActivity();
             if (nrOfCompletedInstances == nrOfInstances - 1) {
                 if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
-                    vars.put("NeedConfirm", true);
-                    vars.put("manager", CtrlConstant.USER_NAME_MANAGER);
+                    vars.put(CtrlConstant.ACT_NEED_CONFIRM, true);
+                    vars.put(CtrlConstant.ACT_MANAGER, CtrlConstant.USER_NAME_MANAGER);
                 } else {
-                    vars.put("NeedConfirm", false);
+                    vars.put(CtrlConstant.ACT_NEED_CONFIRM, false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
-//                    vars.put("NeedDataBack", true);
-//                    vars.put("backFlowUser", "数据回流人");
+//                    vars.put(CtrlConstant.ACT_NEED_DATA_BACK_FLOW, true);
+//                    vars.put(CtrlConstant.ACT_BACK_FLOW_USER, "");
 //                } else {
-                    vars.put("NeedDataBack", false);
+                    vars.put(CtrlConstant.ACT_NEED_DATA_BACK_FLOW, false);
                     // 流程完
 //                }
                 }
@@ -301,7 +301,7 @@ public class TaskController {
         CommonValidator.notNull(task, "任务不存在");
         boolean pass = status == CtrlConstant.STATUS_PASS;
         Map vars = new HashMap();
-        vars.put("Confirm", pass);
+        vars.put(CtrlConstant.ACT_SIGN_CONFIRM, pass);
         return "审核通过成功";
     }
 

src/main/java/com/keymobile/rest/controller/constant/CtrlConstant.java

@@ -8,6 +8,18 @@ public interface CtrlConstant {
     int STATUS_PASS = 1;
     int STATUS_FAIL = 0;
 
+    String ACT_NEED_DATA_AUDIT = "NeedDataAudit";
+    String ACT_NEED_CONFIRM = "NeedConfirm";
+    String ACT_NEED_DATA_BACK_FLOW = "NeedDataBack";
+
+    String ACT_SIGN_DATA_AUDIT = "DataAudit";
+    String ACT_SIGN_CONFIRM = "Confirm";
+
+    String ACT_AUDIT_USER = "auditUser";
+    String ACT_MANAGER = "manager";
+    String ACT_BACK_FLOW_USER = "backFlowUser";
+
+
     int MISSION_TYPE_DATA_ENTER = 1;
     int MISSION_TYPE_DATA_AUDIT = 2;
     int MISSION_TYPE_MANAGER_AUDIT = 3;