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

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

@@ -343,7 +343,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         lambda.eq(JgInstallationNoticeEq::getEquipTransferId, installationInfo.get("sequenceNbr"));
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda);
         if (!ValidationUtil.isEmpty(jgInstallationNoticeEqs)) {
-            List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
             // 压力管道从工程装置表查询设备信息
             if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) {
                 String projectContraptionId = (String) installationInfo.get("projectContraptionId");
@@ -351,8 +350,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 installationInfo.put("pipelineLength", projectContraption.getPipelineLength());
                 installationInfo.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
                 installationInfo.put("projectContraption", projectContraption.getProjectContraption());
-                equipListMaps = jgInstallationNoticeMapper.getPipelineEquInfoByRecords(ids);
+                equipListMaps = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionId);
             } else {
+                List<String> ids = jgInstallationNoticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
                 Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
                 equipListMaps = getEquipListMaps(equips);
             }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -3350,11 +3351,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
                 lambdaDes.eq(IdxBizJgDesignInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoService.getOne(lambdaDes);
-                designInfo.setDesignUnitCreditCode(String.valueOf(map.get("designUnitCreditCode")));
-                designInfo.setDesignUnitName(String.valueOf(map.get("designUnitName")));
-                designInfo.setDesignLicenseNum(ObjectUtils.isEmpty(map.get("designLicenseNum")) ? null : String.valueOf(map.get("designLicenseNum")));
-                designInfo.setDesignUseDate(String.valueOf(map.get("designUseDate")));
-                designInfo.setDesignDate(DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd"));
+                designInfo.setDesignUnitCreditCode(MapUtil.getStr(map,"designUnitCreditCode"));
+                designInfo.setDesignUnitName(MapUtil.getStr(map,"designUnitName"));
+                designInfo.setDesignLicenseNum(MapUtil.getStr(map,"designLicenseNum"));
+                designInfo.setDesignUseDate(MapUtil.getStr(map, "designUseDate"));
+                designInfo.setDesignDate(!StringUtils.isEmpty(map.get("designDate")) ? DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd") : null);
                 designInfo.setDrawingDo(ObjectUtils.isEmpty(map.get("drawingDo")) ? null : String.valueOf(map.get("drawingDo")));
                 designInfo.setAppraisalUnit(ObjectUtils.isEmpty(map.get("appraisalUnit")) ? null : String.valueOf(map.get("appraisalUnit")));
                 designInfo.setAppraisalDate(ObjectUtils.isEmpty(map.get("appraisalDate")) ? null : String.valueOf(map.get("appraisalDate")));
@@ -3368,11 +3369,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
                 factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
-                idxBizJgFactoryInfo.setProduceUnitCreditCode(String.valueOf(map.get("produceUnitCreditCode")));
-                idxBizJgFactoryInfo.setProduceUnitName(String.valueOf(map.get("produceUnitName")));
-                idxBizJgFactoryInfo.setFactoryNum(String.valueOf(map.get("factoryNum")));
-                idxBizJgFactoryInfo.setProduceLicenseNum(String.valueOf(map.get("produceLicenseNum")));
-                idxBizJgFactoryInfo.setProduceDate(DateUtil.parse(String.valueOf(map.get("produceDate")), "yyyy-MM-dd"));
+                idxBizJgFactoryInfo.setProduceUnitCreditCode(MapUtil.getStr(map, "produceUnitCreditCode"));
+                idxBizJgFactoryInfo.setProduceUnitName(MapUtil.getStr(map, "produceUnitName"));
+                idxBizJgFactoryInfo.setFactoryNum(MapUtil.getStr(map, "factoryNum"));
+                idxBizJgFactoryInfo.setProduceLicenseNum(MapUtil.getStr(map, "produceLicenseNum"));
+                idxBizJgFactoryInfo.setProduceDate(!StringUtils.isEmpty(map.get("produceDate")) ? DateUtil.parse(String.valueOf(map.get("produceDate")), "yyyy-MM-dd") : null);
                 idxBizJgFactoryInfo.setImported(ObjectUtils.isEmpty(map.get("imported")) ? null : String.valueOf(map.get("imported")));
                 idxBizJgFactoryInfo.setProduceCountry(ObjectUtils.isEmpty(map.get("produceCountry")) ? null : String.valueOf(map.get("produceCountry")));
                 idxBizJgFactoryInfo.setOtherAccessoriesFact(ObjectUtils.isEmpty(map.get("otherAccessoriesFact")) ? null : JSONObject.toJSONString(map.get("otherAccessoriesFact")));
@@ -3425,13 +3426,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
                     inspectionDetectionInfo.setRecord((String) map.get("equipId"));
                 }
-                inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
-                inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
-                inspectionDetectionInfo.setInspectConclusion(String.valueOf(map.get("inspectConclusion")));
-                inspectionDetectionInfo.setInspectType(String.valueOf(map.get("inspectType")));
-                inspectionDetectionInfo.setInspectDate(DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd"));
-                inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
-                inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd"));
+                inspectionDetectionInfo.setInspectOrgCode(MapUtil.getStr(map, "inspectOrgCode"));
+                inspectionDetectionInfo.setInspectOrgName(MapUtil.getStr(map, "inspectOrgName"));
+                inspectionDetectionInfo.setInspectConclusion(MapUtil.getStr(map,"inspectConclusion"));
+                inspectionDetectionInfo.setInspectType(MapUtil.getStr(map, "inspectType"));
+                inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd") : null);
+                inspectionDetectionInfo.setInspectStaff(MapUtil.getStr(map, "inspectStaff"));
+                inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
                 inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
                 iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
 
@@ -3775,9 +3776,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
             inspectionDetectionInfo.setInspectConclusion(String.valueOf(map.get("inspectConclusion")));
             inspectionDetectionInfo.setInspectType(String.valueOf(map.get("inspectType")));
-            inspectionDetectionInfo.setInspectDate(DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd"));
+            inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd") : null);
             inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
-            inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd"));
+            inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
             inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
             iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
             // 暂存历史表