补证登记相关

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

@@ -186,10 +186,10 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
             certRep.setNextTaskId(processTaskDTO.getNextTask().get(0).getId());
             // 更新下一步可执行人
             certRep.setNextExecuteUserIds(nextUserIds);
-            commonService.saveExecuteFlowData2Redis(certRep.getInstanceId(), buildInstanceRuntimeData(certRep));
             updateTaskModel(certRep);
             createTaskModel(certRep, processTaskDTO, nextUserIds);
         }
+        commonService.saveExecuteFlowData2Redis(certRep.getInstanceId(), buildInstanceRuntimeData(certRep));
         certRep.setApplicationFormFileUrl(Objects.toString(this.getCertReplenishFormUrl(jsonObject, certRep.getApplyNo()).get(APPLICATION_FORM_FILE_URL)));
         this.updateById(certRep);
         this.updateCertRepEqs(jsonObject);
@@ -347,9 +347,10 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         Long sequenceNbr = sequence.nextId();
         JSONArray equLists = jsonObj.getJSONArray(EQU_LISTS);
         this.saveCertRepEqs(sequenceNbr, equLists);
-        JgCertificateReplenish certRep = this.buildCertRep(sequenceNbr, jsonObj, new WorkflowResultDto());
+        JgCertificateReplenish certRep = this.buildCertRep(sequenceNbr, jsonObj, new WorkflowResultDto(), FlowStatusEnum.TO_BE_SUBMITTED);
         certRep.setApplicationFormFileUrl(Objects.toString(this.getCertReplenishFormUrl(jsonObj, certRep.getApplyNo()).get(APPLICATION_FORM_FILE_URL)));
         this.save(certRep);
+        this.createNewTodo(certRep, new WorkflowResultDto(), new TaskV2Model(), FlowStatusEnum.TO_BE_SUBMITTED);
         return certRep;
     }
 
@@ -362,7 +363,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         FlowingEquipRedisContext.getContext().forEach(e -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey()));
     }
 
-    public JgCertificateReplenish buildCertRep(Long sequenceNbr, JSONObject jsonObj, WorkflowResultDto workflowResultDto) {
+    public JgCertificateReplenish buildCertRep(Long sequenceNbr, JSONObject jsonObj, WorkflowResultDto workflowResultDto, FlowStatusEnum flowStatusEnum) {
         JgCertificateReplenishDto dto = JSON.parseObject(JSONObject.toJSONString(jsonObj), JgCertificateReplenishDto.class);
         Date date = new Date();
         String[] receiveOrg = Objects.toString(jsonObj.get(RECEIVE_ORG_CODE)).split("_");
@@ -378,7 +379,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         certRep.setPromoter(RequestContext.getExeUserId());
         certRep.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         certRep.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-        certRep.setApplyStatus(Objects.toString(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+        certRep.setApplyStatus(Objects.toString(flowStatusEnum.getCode()));
         certRep.setReceiveOrgCode(receiveOrg[0]);
         certRep.setReceiveOrgName(receiveOrg[1]);
         certRep.setUseUnitCode(getSelectedOrgInfo().getCompany().getCompanyCode());
@@ -425,7 +426,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         // 启动工作流
         List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveOrgCode().split("_")[0], model.getApplyNo());
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
-        JgCertificateReplenish certRep = this.buildCertRep(sequenceNbr, jsonObj, workflowResultDto);
+        JgCertificateReplenish certRep = this.buildCertRep(sequenceNbr, jsonObj, workflowResultDto, FlowStatusEnum.TO_BE_PROCESSED);
         commonService.saveExecuteFlowData2Redis(workflowResultDto.getInstanceId(), buildInstanceRuntimeData(certRep));
         // 代办
         this.buildTask(certRep, workflowResultList);
@@ -539,7 +540,26 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(certRep, taskMessageDto);
 
-        TaskModelDto taskModelDto = TaskModelDto.builder().flowCreateDate(taskV2Model.getFlowCreateDate()).taskName(workflowResultDto.getNextTaskName()).taskCode(taskV2Model.getTaskCode()).taskType(taskV2Model.getTaskType()).taskTypeLabel(taskV2Model.getTaskTypeLabel()).relationId(taskV2Model.getRelationId()).executeUserIds(workflowResultDto.getNextExecutorUserIds()).taskStatusLabel(statusEnum.getName()).flowStatus(statusEnum.getCode()).flowCode(workflowResultDto.getNextTaskId()).flowStatusLabel(statusEnum.getName()).taskContent(String.format("来自%s的业务办理，【申请单号：%s】", certRep.getEquList(), certRep.getApplyNo())).taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", certRep.getEquList(), certRep.getApplyNo())).startUserCompanyName(getSelectedOrgInfo().getCompany().getCompanyName()).startUserId(taskV2Model.getStartUserId()).startUser(taskV2Model.getStartUser()).startDate(taskV2Model.getStartDate()).pageType(statusEnum.getCode() == 6614 ? "edit" : "look").model(taskMessageDto).nextExecuteUser(workflowResultDto.getNextExecutorRoleIds()).build();
+        TaskModelDto taskModelDto = TaskModelDto.builder()
+                .flowCreateDate(taskV2Model.getFlowCreateDate())
+                .taskName(workflowResultDto.getNextTaskName())
+                .taskCode(taskV2Model.getTaskCode())
+                .taskType(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getCode())
+                .taskTypeLabel(BusinessTypeEnum.JG_REPLACEMENT_REGISTRATION.getName())
+                .relationId(String.valueOf(certRep.getSequenceNbr()))
+                .executeUserIds(workflowResultDto.getNextExecutorUserIds())
+                .taskStatusLabel(statusEnum.getName()).flowStatus(statusEnum.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
+                .flowStatusLabel(statusEnum.getName())
+                .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", certRep.getEquList(), certRep.getApplyNo()))
+                .taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", certRep.getEquList(), certRep.getApplyNo())).startUserCompanyName(getSelectedOrgInfo().getCompany().getCompanyName())
+                .startUserId(taskV2Model.getStartUserId())
+                .startUser(taskV2Model.getStartUser())
+                .startDate(taskV2Model.getStartDate())
+                .pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
+                .model(taskMessageDto)
+                .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
+                .build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }