安装改造Bug修复

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/JgInstallationNoticeServiceImpl.java

@@ -185,7 +185,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey("installationNotification");
+                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
@@ -490,10 +490,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            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")));