Merge branch 'develop_tzs_register' of…

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

@@ -124,7 +124,8 @@
             ei.address AS address,
             ei.use_code AS useCode,
             isn.install_unit_credit_code AS installUnitCreditCode,
-            idi.INSPECT_REPORT as inspectReport
+            idi.INSPECT_REPORT as inspectReport,
+            re.equ_id as equId
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr

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

@@ -159,7 +159,8 @@
             ui.COUNTY_NAME AS useUnitCountyName,
             ui.ADDRESS AS useUnitAddress,
             eio.use_code AS useCode,
-            idi.INSPECT_REPORT as inspectReport
+            idi.INSPECT_REPORT as inspectReport,
+            re.equ_id as equId
         FROM
             tzs_jg_transfer_notice tjtn
                 LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr

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

@@ -183,6 +183,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
@@ -217,6 +218,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .executeUserIds(workflowResultDto.getNextExecutorUserIds())
                 .taskStatusLabel(statusEnum.getName())
                 .flowStatus(statusEnum.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
                 .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
                 .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))

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

@@ -107,6 +107,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
 
     @Autowired
+    IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
+
+    @Autowired
     private CommonMapper commonMapper;
 
 //    @Autowired
@@ -193,13 +196,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
         Map<String, Object> detail = equipmentInfos.get(0);
-        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
-        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
-        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
-        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
-        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
-        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
-        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
+        equInfo.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        equInfo.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        equInfo.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        equInfo.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
+        equInfo.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        equInfo.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+
+        BeanUtil.copyProperties(equInfo, detail);
         BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("installationInfo", detail);

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

@@ -530,6 +530,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
                 .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
@@ -812,6 +813,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .executeUserIds(workflowResultDto.getNextExecutorUserIds())
                 .taskStatusLabel(statusEnum.getName())
                 .flowStatus(statusEnum.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
                 .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
                 .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
@@ -825,5 +827,4 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }
-
 }
\ No newline at end of file

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

@@ -73,6 +73,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     private JgTransferNoticeMapper jgTransferNoticeMapper;
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
+    @Autowired
+    IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
 
 
     @Autowired
@@ -139,13 +141,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
         }
         Map<String, Object> detail = equipmentInfos.get(0);
-        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
-        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
-        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
-        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
-        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
-        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
-        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
+        equInfo.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        equInfo.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        equInfo.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        equInfo.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
+        equInfo.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        equInfo.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        BeanUtil.copyProperties(equInfo, detail);
         BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("transferNoticeInfo", detail);