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/JgInstallationNoticeMapper.xml

@@ -88,13 +88,13 @@
             tec1.name                       AS equList,
             tec.name                        AS equDefine,
 
-            isn.equ_register_code AS equRegisterCode,
+            if(isn.equ_register_code is null or isn.equ_register_code = 'null', '', isn.equ_register_code) AS equRegisterCode,
 
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -119,7 +119,8 @@
             ei.legal_phone AS safetyManagerPhone,
             ei.address AS address,
             ei.use_code AS useCode,
-            isn.install_unit_credit_code AS installUnitCreditCode
+            isn.install_unit_credit_code AS installUnitCreditCode,
+            idi.INSPECT_REPORT as inspectReport
         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

@@ -120,12 +120,12 @@
             oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
-            ri.equ_code AS equRegisterCode,
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.EQU_CODE AS equRegisterCode,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -152,7 +152,8 @@
             ui.CITY_NAME AS useUnitCityName,
             ui.COUNTY_NAME AS useUnitCountyName,
             ui.ADDRESS AS useUnitAddress,
-            eio.use_code AS useCode
+            eio.use_code AS useCode,
+            idi.INSPECT_REPORT as inspectReport
         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/controller/JgScrapCancelController.java

@@ -78,7 +78,7 @@ public class JgScrapCancelController extends BaseController {
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 
-        jgScrapCancelService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
+        jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(), Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -194,31 +194,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment"};
-
         // 设备信息
-//        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
-
+        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s:fields) {
             if(installationInfo.containsKey(s)) {
                 installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(installationInfo.get(s).toString()));
             }
         }
-        QueryWrapper<JgInstallationNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgInstallationNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgInstallationNoticeEq jgInstallationNoticeEq = jgInstallationNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgInstallationNoticeEq.getEquId());
-        if (!ObjectUtils.isEmpty(inspectDetail)) {
-            detail.putAll(inspectDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDetail)) {
-            detail.putAll(useDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
-        }
+        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"))));
@@ -226,8 +209,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         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"))));
-
-        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum");
+        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("installationInfo", detail);
         }};
@@ -628,14 +610,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setEquList((String.valueOf(obj.get("EQU_CATEGORY"))));
+            dto.setEquList((String.valueOf(obj.get("EQU_LIST"))));
             dto.setEntrustingUnitName(dto.getUseUnitName());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
             dto.setEquRegisterCode(String.valueOf(obj.get("EQU_CODE")));
             dto.setFactoryNum(String.valueOf(obj.get("FACTORY_NUM")));
-            StringBuffer buffer = new StringBuffer();
-            buffer.append(dto.getProvinceName()).append(dto.getCityName()).append(dto.getCountyName()).append(dto.getAddress());
-            dto.setEquAddress(buffer.toString());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(workflowResultList)) {
@@ -760,6 +739,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 model.setInstallLeaderName(leaderList[1]);
             }
         }
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(model.getProvinceName()).append(model.getCityName()).append(model.getCountyName()).append(model.getStreetName()).append(model.getAddress());
+        model.setEquAddress(buffer.toString());
     }
 
 

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

@@ -523,7 +523,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             IdxBizJgRegisterInfo one = idxBizJgRegisterInfoMapper.selectOne(queryWrapper);
             installationInfo.put("equCode", one.getEquCode());
             Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
+            String equList = String.valueOf(detailFieldCamelCaseByRecord.getOrDefault("equList", ""));
             BeanUtil.copyProperties(installationInfo, detailFieldCamelCaseByRecord);
+            detailFieldCamelCaseByRecord.put("equList", equList);
+            detailFieldCamelCaseByRecord.put("EQU_LIST_CODE", equList);
             return new HashMap<String, Object>() {{
                 this.put(PAGE_KEY, detailFieldCamelCaseByRecord);
             }};
@@ -579,7 +582,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     @Transactional
-    public void flowExecute(Long id, String instanceId, String operate, String comment) {
+    public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
         //组装信息
@@ -598,17 +601,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         //执行流程
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
-        updateExecuteIds(instanceId, id, operate, processTaskDTO);
+        updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
     }
 
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
+    public void updateExecuteIds(String equList, String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName = "";
         String nextTaskId = "";
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr);
+        jgScrapCancel.setEquList(equList);
         if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();

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

@@ -127,29 +127,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
         // 设备信息
-        QueryWrapper<JgTransferNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgTransferNoticeEq jgTransferNoticeEq = jgTransferNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgTransferNoticeEq.getEquId());
-        if (!ObjectUtils.isEmpty(inspectDetail)) {
-            detail.putAll(inspectDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDetail)) {
-            detail.putAll(useDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
-        }
-        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"))));
+        List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
+
         for (String s : fields) {
             if (transferNotice.containsKey(s)) {
                 if ("powerOfAttorney".equalsIgnoreCase(s)) {
@@ -161,10 +140,19 @@ 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"))));
         BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("transferNoticeInfo", detail);
         }};
+
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -399,6 +399,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             unitCode = jyjcOpeningApplicationModel.getUnitCode();
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
+            jyjcOpeningApplicationModel.setResultType("input");
             unitCode = reginParams.getCompany().getCompanyCode();
         }
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();