Преглед изворни кода

加上发起流程指定设备类型

xuzhancheng пре 1 недеља
родитељ
комит
1ee1b8dc7c

+ 6 - 0
tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java

@@ -33,4 +33,10 @@ public class BpmProcessInstanceCreateReqDTO {
     @Schema(description = "发起人自选审批人 Map")
     @Schema(description = "发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;
     private Map<String, List<String>> startUserSelectAssignees;
 
 
+    /**
+     * 设备类型
+     * 100 - 容器 200 - 锅炉 300 - 管道
+     */
+    @Schema(description = "设备类型")
+    private String EquipMainType;
 }
 }

+ 8 - 3
tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/task/BpmProcessInstanceServiceImpl.java

@@ -578,7 +578,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
         ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
         // 发起流程
         // 发起流程
         return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
         return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
-                createReqVO.getStartUserSelectAssignees());
+                createReqVO.getStartUserSelectAssignees(), null);
     }
     }
 
 
     @Override
     @Override
@@ -588,13 +588,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
             ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
             ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
             // 发起流程
             // 发起流程
             return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
             return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
-                    createReqDTO.getStartUserSelectAssignees());
+                    createReqDTO.getStartUserSelectAssignees(),createReqDTO);
         });
         });
     }
     }
 
 
     private String createProcessInstance0(String userId, ProcessDefinition definition,
     private String createProcessInstance0(String userId, ProcessDefinition definition,
                                           Map<String, Object> variables, String businessKey,
                                           Map<String, Object> variables, String businessKey,
-                                          Map<String, List<String>> startUserSelectAssignees) {
+                                          Map<String, List<String>> startUserSelectAssignees, BpmProcessInstanceCreateReqDTO createReqDTO) {
         // 1.1 校验流程定义
         // 1.1 校验流程定义
         if (definition == null) {
         if (definition == null) {
             throw exception(PROCESS_DEFINITION_NOT_EXISTS);
             throw exception(PROCESS_DEFINITION_NOT_EXISTS);
@@ -617,6 +617,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         if (variables == null) {
         if (variables == null) {
             variables = new HashMap<>();
             variables = new HashMap<>();
         }
         }
+
+        if (createReqDTO != null) {
+            variables.put("equipMainType", createReqDTO.getEquipMainType());
+        }
+
         AdminUserRespDTO user = adminUserApi.getUser(userId).getCheckedData();
         AdminUserRespDTO user = adminUserApi.getUser(userId).getCheckedData();
 
 
         FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下,避免 ProcessInstance 系统级的变量被占用
         FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下,避免 ProcessInstance 系统级的变量被占用