移装告知给工作流增加接收机构传参

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -265,6 +265,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
@@ -298,6 +300,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     commMap.put("approvalStatus", op);
                 }
                 dto.setVariable(commMap);
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
                 processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -389,7 +392,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
         // 启动工作流并返回信息
-        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
+        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveOrgCode());
         List<JgTransferNotice> list = new ArrayList<>();
         List<JgTransferNoticeEq> equipList = new ArrayList<>();
         //业务数据组装等
@@ -485,7 +488,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @param deviceList 设备信息
      * @return 工作流返回相关数据
      */
-    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveOrgCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -494,6 +497,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(receiveOrgCode);
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
@@ -713,6 +718,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } else {
             commMap.put("approvalStatus", op);
         }
+        workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);