1、历史设备登记补充存储字段

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

@@ -738,12 +738,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("FULLADDRESS", fullAddress);
                 }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
+                useInfoMap.put("USE_PLACE", useInfo.getUsePlace());
                 if (!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
                     useInfoMap.put("LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
                     useInfoMap.put("USE_LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
                 }
                 if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
                     useInfoMap.put("USE_ADDRESS", useInfo.getAddress());
+                    useInfoMap.put("FULL_ADDRESS", useInfo.getAddress());
                 }
             }
             if (!useInfoMap.isEmpty()) {

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

 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 com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -33,6 +34,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
@@ -113,6 +115,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
+    IdxBizJgDesignInfoMapper idxBizJgDesignInfoMapper;
+    @Autowired
+    IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoService;
+    @Autowired
     TzsUserInfoMapper userInfoMapper;
     @Autowired
     ICommonService commonService;
@@ -152,6 +158,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     @Autowired
+    private IdxBizJgFactoryInfoMapper idxBizJgFactoryInfoMapper;
+    @Autowired
+    IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
+    @Autowired
     private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
     @Autowired
     private RedissonClient redissonClient;
@@ -2671,14 +2681,50 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
                 registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
-                String equCode = this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode());
+                registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
+                String equCode = ObjectUtils.isEmpty(map.get("equCode")) ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode()) : String.valueOf(map.get("equCode"));
                 registerInfo.setEquCode(equCode);// 设备代码
+                registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
+                registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
+                registerInfo.setOtherAccessoriesReg(JSONObject.toJSONString(map.get("otherAccessoriesReg")));
                 idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
-                // 查询设备制造信息
+                // 设计信息
+                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(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.setDrawingDo(String.valueOf(map.get("drawingDo")));
+                designInfo.setAppraisalUnit(String.valueOf(map.get("appraisalUnit")));
+                designInfo.setAppraisalDate(String.valueOf(map.get("appraisalDate")));
+                designInfo.setDesignDoc(JSONObject.toJSONString(map.get("designDoc")));
+                designInfo.setDesignStandard(JSONObject.toJSONString(map.get("designStandard")));
+                designInfo.setOtherAccessoriesDes(JSONObject.toJSONString(map.get("otherAccessoriesDes")));
+                idxBizJgDesignInfoMapper.updateById(designInfo);
+
+
+                // 制造信息
                 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.setImported(String.valueOf(map.get("imported")));
+                idxBizJgFactoryInfo.setProduceCountry(String.valueOf(map.get("produceCountry")));
+                idxBizJgFactoryInfo.setOtherAccessoriesFact(JSONObject.toJSONString(map.get("otherAccessoriesFact")));
+                idxBizJgFactoryInfo.setProductQualityYieldProve(JSONObject.toJSONString(map.get("productQualityYieldProve")));
+                idxBizJgFactoryInfo.setInsUseMaintainExplain(JSONObject.toJSONString(map.get("insUseMaintainExplain")));
+                idxBizJgFactoryInfo.setFactoryStandard(JSONObject.toJSONString(map.get("factoryStandard")));
+                idxBizJgFactoryInfo.setFactSupervisionInspectionReport(JSONObject.toJSONString(map.get("factSupervisionInspectionReport")));
+                idxBizJgFactoryInfo.setBoilerEnergyEfficiencyCertificate(JSONObject.toJSONString(map.get("boilerEnergyEfficiencyCertificate")));
+                idxBizJgFactoryInfoMapper.updateById(idxBizJgFactoryInfo);
 
                 // 使用信息
                 LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
@@ -2699,6 +2745,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
                 useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
                 useInfo.setEstateUnitName(String.valueOf(map.get("estateUnitName")).split("_")[1]);
+                useInfo.setPhone(String.valueOf(map.get("safetyManager")).split("_")[0]);
+                useInfo.setSafetyManager(String.valueOf(map.get("safetyManager")).split("_")[1]);
+                useInfo.setUseDate(String.valueOf(map.get("useDate")));
                 String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName()  +"/" + useInfo.getStreetName();
                 useInfoMapper.updateById(useInfo);
 
@@ -2706,6 +2755,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
                 IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
 
+                // 检验检测【一对多，暂时只取最新一条数据】
+                IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+                if (ObjectUtils.isEmpty(inspectionDetectionInfo)) {
+                    inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
+                }
+                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.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
+                iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
                 // 生成监管码 96333码
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
                 map.put("equCode", equCode);