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/resources/mapper/JgEnableDisableMapper.xml

@@ -60,7 +60,7 @@
     </select>
     <select id="getDetail" resultType="java.util.Map">
         SELECT jed.sequence_nbr        as sequenceNbr,
-               concat(jed.receive_org_code,'_',jed.receive_org_name)    as receiveOrgCode,
+               concat(jed.receive_company_code,'_',jed.receive_org_name)    as receiveOrgCode,
                concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
                       use.STREET_NAME) as fullAddress,
                jri.EQU_CODE            as equCode,

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

@@ -711,7 +711,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
             //任务发起人发起时间
             taskModelDto.setStartDate(new Date());
-            taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
+            taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             //跳转路径
 //        taskModelDto.setRoutePath();
             taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));

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

@@ -410,12 +410,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             baseMapper.updateById(equipTransfer);
 
             commonService.rollbackTask(equipTransfer.getInstanceId(), new JSONObject(MapBuilder.<String, Object>create()
-                    .put("nextTaskId", equipTransfer.getNextTaskId())
+                    //.put("nextTaskId", equipTransfer.getNextTaskId())
                     .put("nextExecuteUser", equipTransfer.getNextExecuteIds())
                     .put("taskType", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
-                    .put("flowStatus", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
-                    .put("flowStatusLabel", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
-                    //.put("pageType", "look")
+                    .put("flowStatus", FlowStatusEnum.ROLLBACK.getCode())
+                    .put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName())
+                    //.put("pageType", "edit")
                     .build()));
         }
     }

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

@@ -117,12 +117,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("powerOfAttorneyList", JSON.parseArray(notice.getPowerOfAttorney()));
         maintainInfo.put("constructionContractList", JSON.parseArray(notice.getConstructionContract()));
         maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
-        maintainInfo.put("city", notice.getCity() + "_" + notice.getCityName());
-        maintainInfo.put("constructionManagerId", notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
-        maintainInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
+        maintainInfo.put("city", ObjectUtils.isEmpty(notice.getCity()) ? null : notice.getCity() + "_" + notice.getCityName());
+        maintainInfo.put("constructionManagerId",ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null :  notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
+        maintainInfo.put("county",ObjectUtils.isEmpty(notice.getCounty()) ? null :  notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
-        maintainInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
-        maintainInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
+        maintainInfo.put("useUnitCreditCode",ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null :   notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        maintainInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         if (!ValidationUtil.isEmpty(notice.getInspectionUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getInspectionUnitName())) {
             maintainInfo.put("inspectUnitId", notice.getInspectionUnitCreditCode() + "_" + notice.getInspectionUnitName());
         }
@@ -191,6 +191,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                notice.setInstanceId(workflowResultDto.getInstanceId());
                 jgMaintainNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto),Boolean.TRUE);
@@ -434,20 +435,20 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextExecuteUserIds(workflowResultDtoList.get(i).getNextExecutorUserIds());
+                dto.setNextTaskId(workflowResultDtoList.get(i).getNextTaskId());
+                dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
+                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+            } else {
+                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
             dto.setEquList(obj.get("EQU_LIST").toString());
             dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setNextTaskId(workflowResultDtoList.get(i).getNextTaskId());
+
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
-            if (!CollectionUtils.isEmpty(workflowResultDtoList)) {
-                dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-            } else {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            }
+
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
@@ -486,7 +487,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
-            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            dto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
             ////业务主键
             dto.setRelationId(obj.getSequenceNbr() + "");
             modelDtos.add(dto);
@@ -507,7 +508,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setTaskCode(item.getApplyNo());
             taskModelDto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName());
-            taskModelDto.setRelationId(item.getInstanceId());
+            taskModelDto.setRelationId(workflowResultDto.getInstanceId());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
@@ -632,6 +633,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (receiveOrgIdList.length > 1) {
                 model.setReceiveCompanyCode(receiveOrgIdList[0]);
                 model.setReceiveOrgName(receiveOrgIdList[1]);
+                model.setReceiveOrgCode(null);
             }
         }
 
@@ -699,6 +701,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgMaintainNotice));
         jsonObject.put("nextExecuteUser", jgMaintainNotice.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
 
         commonService.rollbackTask(jgMaintainNotice.getInstanceId(), jsonObject);
     }

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

@@ -671,6 +671,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     .put("nextTaskId", notice.getNextTaskId())
                     .put("nextExecuteUser", notice.getNextExecuteIds())
                     .put("taskType", BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
+                    .put("flowStatus", FlowStatusEnum.ROLLBACK.getCode())
+                    .put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName())
+                    .put("pageType", "edit")
                     .build()));
         }
     }
@@ -798,6 +801,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .startUser(taskV2Model.getStartUser())
                 .startDate(taskV2Model.getStartDate())
                 .model(transfer)
+                .pageType("edit")
                 .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
                 .build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));

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

@@ -12,6 +12,12 @@
     "url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=detail&roleIds={roleIds}&userId={userId}"
   },
   {
+    "type": "101",
+    "pageType": "edit",
+    "name": "设备移交",
+    "url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=edit&roleIds={roleIds}&userId={userId}"
+  },
+  {
     "type": "102",
     "pageType": "draft",
     "name": "安装告知",
@@ -103,6 +109,12 @@
   },
   {
     "type": "107",
+    "pageType": "draft",
+    "name": "使用登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "107",
     "pageType": "look",
     "name": "使用登记",
     "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=look"