1.修改更名变更

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

@@ -210,13 +210,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
-            taskModelDto.setExecuteUserIds(dto.getNextExecutorIds());
+            taskModelDto.setExecuteUserIds(nextUserIds);
             taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
             taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
             taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
-            taskModelDto.setNextExecuteUser(nextUserIds);
+            taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());
             taskModelDto.setModel(dto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
@@ -316,7 +316,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         // 再插入新代办、数据待定
         taskV2Model.setTaskName(taskName);
         taskV2Model.setExecuteUserIds(nextUserIds);
-        Systemctl.taskV2Client.create(taskV2Model);
+        taskV2Model.setTaskStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getAuditStatus());
+        TaskModelDto modelDto = new TaskModelDto();
+        BeanUtil.copyProperties(taskV2Model,modelDto);
+        modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
+        modelDto.setModel(jgChangeRegistrationName);
+        commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
 
 
@@ -333,7 +339,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     private void convertField(JgChangeRegistrationNameDto model) {
-        // 处理文件
+        // 处理文件1
         if (!ValidationUtil.isEmpty(model.getChangeCertificateList())) {
             model.setChangeCertificate(JSON.toJSONString(model.getChangeCertificateList()));
         }
@@ -414,10 +420,12 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         List<String> roleListAll = new ArrayList<>();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName = "";
+        String nextTaskId = "";
         JgChangeRegistrationName jgChangeRegistrationName = this.getBaseMapper().selectById(sequenceNbr);
-        if(processTaskDTO != null){
+        if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();
+            nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -426,6 +434,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgChangeRegistrationName.setNextExecutorIds(String.join(",",roleListNext));
             jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
             jgChangeRegistrationName.setInstanceId(instanceId);
+            jgChangeRegistrationName.setNextTaskId(nextTaskId);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus())) {
                 jgChangeRegistrationName.setInstanceStatus(jgChangeRegistrationName.getInstanceStatus() + "," + String.join(",",roleListNext));
             } else {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -87,13 +87,13 @@
     "type": "108",
   "pageType": "look",
   "name": "更名变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=look"
+  "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "108",
     "pageType": "edit",
     "name": "更名变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "109",