Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationNameDto.java

@@ -106,4 +106,9 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     private String nextTaskId;
 
 
+    /**
+     * 下一节点可执行人
+     */
+    private String nextExecuteUserIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationName.java

@@ -148,5 +148,10 @@ public class JgChangeRegistrationName extends BaseEntity {
     @TableField("next_task_id")
     private String nextTaskId;
 
+    /**
+     * 下一节点可执行人
+     */
+    @TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -109,9 +109,6 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.equ_define AS equDefine,
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,

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

@@ -556,8 +556,8 @@ public class CommonServiceImpl implements ICommonService {
             jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             //兼容业务逻辑代码
-            if(submitType.equals("1")){
-                noticeObj.put("submit","true");
+            if (submitType.equals("1")) {
+                noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
@@ -584,7 +584,7 @@ public class CommonServiceImpl implements ICommonService {
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
             jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
-        } else if (type.equals(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
+        } else if (type.contains(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(SBZX_PAGE_ID, noticeObj);
@@ -631,7 +631,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams+"&nextExecuteUserIds="+model.getExecuteUserIds());
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }
             }
@@ -806,7 +806,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("look")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}",obj.get("nextExecuteUser").toString()) + urlParams);
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
                     break;
                 }
             }

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

@@ -175,6 +175,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         if (!StringUtils.isEmpty(instanceId)) {
             dto.setInstanceId(instanceId);
             dto.setNextTaskId(nextTaskId);
+            dto.setNextExecuteUserIds(nextUserIds);
             dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
         } else {
             dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
@@ -276,6 +277,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     jgChangeRegistrationName.setInstanceId(instanceId);
                     jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                     jgChangeRegistrationName.setNextTaskId(nextTaskId);
+                    jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
                     jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                     // 创建待办
                     createTaskModel(jgChangeRegistrationName, taskName, "1", nextUserIds);
@@ -301,6 +303,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                 jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                 jgChangeRegistrationName.setNextTaskId(nextTaskId);
+                // 更新下一步可执行人
+                jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, op);
             }
             this.updateById(jgChangeRegistrationName);
@@ -397,6 +401,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
         jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
         jgChangeRegistrationName.setNextTaskId(nextTaskId);
+        List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+        // 更新下一步可执行人
+        String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+        jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
         this.update(jgChangeRegistrationName, lambda);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationName));
@@ -453,6 +461,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
             jgChangeRegistrationName.setInstanceId(instanceId);
             jgChangeRegistrationName.setNextTaskId(nextTaskId);
+            // 更新下一步可执行人
+            jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus())) {
                 jgChangeRegistrationName.setInstanceStatus(jgChangeRegistrationName.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
@@ -471,6 +481,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         } else {
             jgChangeRegistrationName.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationName.setAuditPassDate(new Date());
+            // 完成时 下一步骤可执行人清空
+            jgChangeRegistrationName.setNextExecuteUserIds("");
             // 修改业务信息
             updateInfoOther(jgChangeRegistrationName);
             // 更新代办

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

@@ -640,6 +640,14 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @return
      */
     public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {
+        //设置实体无需字段为空
+        jgChangeRegistrationReform.setTransformationQualityCertificate(null);
+        jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(null);
+        jgChangeRegistrationReform.setRegDate(null);
+        jgChangeRegistrationReform.setCreateDate(null);
+        jgChangeRegistrationReform.setAuditPassDate(null);
+        jgChangeRegistrationReform.setInputUnitNo(null);
+
 
         List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);

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

@@ -239,8 +239,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             oldTransfer.setReceiveOrgName(receiveOrgName);
         }
         //办理状态
-        oldTransfer.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        oldTransfer.setStatus(UseStatusEnum.SUBMIT.getPass());
+        oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
+        oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
 
         //es种查询设备信息
         SearchRequest request = new SearchRequest();

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

@@ -79,9 +79,9 @@
   },
   {
     "type": "108",
-  "pageType": "look",
-  "name": "更名变更登记",
-  "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
+    "pageType": "look",
+    "name": "更名变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "108",
@@ -153,13 +153,13 @@
     "type": "113-1",
     "pageType": "look",
     "name": "移装报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-1",
     "pageType": "edit",
     "name": "移装报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=edit&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -27,7 +27,7 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG", "DJ_DW"),//单位变更登记
     JY("JY", ""),
     JG("JG", ""),// 检验结果
-    SBZX("SBZX", "BF_ZX"),//电梯（设备）注销
+    SBZX("SBZX", "BF"),//电梯（设备）注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     TYQY("TYQY", "SB_QY")//停用启用
     ;