更新

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

@@ -296,7 +296,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey("transferNotification");
+                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
@@ -463,10 +463,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
-            dto.setPromoter(reginParams.getUserModel().getUserId());
-            dto.setStatus(taskName[0]);
+            if(SUBMIT_TYPE_FLOW.equals(submitType)) {
+                dto.setNextExecuteIds(String.join(",", roleListSecond));
+                dto.setInstanceStatus(String.join(",", roleListFirst));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setStatus(taskName[0]);
+            }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));