1、施工信息查询不对

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/VehicleApanageEnum.java

@@ -28,7 +28,12 @@ public enum VehicleApanageEnum {
     YANG_LING("陕V","610403"),
     SHEN_MU("陕K","610881"),
     FU_GU("陕K","610822"),
-    HAN_CHENG("陕Y","610581");
+    HAN_CHENG("陕Y","610581"),
+    XI_XIAN_QH("陕U","617001"),
+    XI_XIAN_JH("陕U","617002"),
+    XI_XIAN_FD("陕U","617003"),
+    XI_XIAN_KG("陕U","617004"),
+    XI_XIAN_FX("陕U","617005");
 
     private final String city;
     private final String code;

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

@@ -671,10 +671,10 @@
             tjin."install_contract_attachment"       as  installContractAttachment ,
             tjin."other_accessories"                 as  insOtherAccessories
         FROM "tzs_jg_installation_notice_eq" AS tjine
-        LEFT JOIN "tzs_jg_installation_notice" AS tjin ON tjine."equip_transfer_id" = tjin."sequence_nbr"
+            LEFT JOIN "tzs_jg_installation_notice" AS tjin ON tjine."equip_transfer_id" = tjin."sequence_nbr"
         WHERE tjine."equ_id" = #{id} AND tjin."notice_status" = '6616'
-        ORDER BY tjine."rec_date" desc
-        LIMIT 1
+            ORDER BY tjine."rec_date" desc
+            LIMIT 1
     </select>
 
     <select id="getiInstallDetailByIdx" resultType="java.util.Map">
@@ -697,7 +697,7 @@
         left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
         left join  "idx_biz_jg_register_info" as re on re."RECORD" = ibjci."RECORD"
         WHERE ibjci."RECORD" = #{id}
-        ORDER BY ibjci."rec_date" desc
+        ORDER BY ibjci.USC_DATE desc
         LIMIT 1
     </select>
 

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

@@ -55,6 +55,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
@@ -1906,7 +1907,7 @@ public class CommonServiceImpl implements ICommonService {
      * @param supervisoryCompanyCode 接收机构单位代码
      * @return 使用登记编号
      */
-    public String generateRegistrationCode(String equipId, String supervisoryCode, String supervisoryCompanyCode, boolean isUnit) {
+    public String generateRegistrationCode(String equipId, String supervisoryCompanyCode, boolean isUnit) {
         // 根据设备id查询设备类别、品种
         LambdaQueryWrapper<RegistrationInfo> equipWrapper = new LambdaQueryWrapper<>();
         equipWrapper.eq(RegistrationInfo::getRecord, equipId);
@@ -1919,7 +1920,6 @@ public class CommonServiceImpl implements ICommonService {
                 String equCategoryAbbrName = CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) ?
                         CylinderTypeEnum.CYLINDER.getName() :
                         EquipTypeEnum.getMessage(equCategory.substring(0, 1));
-
                 // 设备代码中间两位
                 String equipType2MidDigits = equCategory.substring(1, 3);
                 //台套还是取品种的中间两位
@@ -1928,17 +1928,15 @@ public class CommonServiceImpl implements ICommonService {
                         equipType2MidDigits = equDefine.substring(1, 3);
                     }
                 }
-
-                // 登记机关代号
-                String city = supervisoryCode.substring(0, 1);
-                // 西咸新区监管码对应的设备使用登记证还按咸阳(D)生成
-                if ("X".equals(city)) {
-                    city = "D";
-                }
+                // 登记机关代号,特殊区域用特殊区域如韩城-Y、杨凌-V、西咸-U
+                String city = "";
                 if (!ValidationUtil.isEmpty(supervisoryCompanyCode)) {
                     DataDictionary specialRegionCode = dataDictionaryService.getByCode(supervisoryCompanyCode, SPECIAL_REGION_CODE);
-                    if (!ValidationUtil.isEmpty(specialRegionCode)) {
+                    if (!ValidationUtil.isEmpty(specialRegionCode)) {  // 特殊的区域
                         city = specialRegionCode.getName();
+                    } else {                                           // 普通的地市
+                        DataDictionary regionCodeDict = equipmentCategoryMapper.getOneDictByTypeAndExtend(EquipmentCategoryEnum.XZQH.getCode(), supervisoryCompanyCode);
+                        city = regionCodeDict.getCode();
                     }
                 }
                 return generateUniqueUseRegistrationCode(equCategoryAbbrName, equipType2MidDigits, city);
@@ -1974,61 +1972,6 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     /**
-     * 生成使用登记编号
-     *
-     * @param equipId                设备id
-     * @param supervisoryCompanyCode 接收机构单位代码
-     * @return 使用登记编号
-     */
-    public String generateRegistrationCode(String equipId, JgRegistrationHistory historyData, String supervisoryCompanyCode, boolean isUnit) {
-        // 根据设备id查询设备类别、品种
-        LambdaQueryWrapper<RegistrationInfo> equipWrapper = new LambdaQueryWrapper<>();
-        equipWrapper.eq(RegistrationInfo::getRecord, equipId);
-        RegistrationInfo equipRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(equipWrapper);
-        if (!ValidationUtil.isEmpty(equipRegistrationInfo)) {
-            String equCategory = equipRegistrationInfo.getEquCategory(); // 设备类别 "3100"
-            String equDefine = equipRegistrationInfo.getEquDefine(); // 设备品种 "3110"
-            if (!ObjectUtils.isEmpty(equCategory)) {
-                // 设备种类简称，如果是气瓶返回瓶
-                String equCategoryAbbrName = CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) ?
-                        CylinderTypeEnum.CYLINDER.getName() :
-                        EquipTypeEnum.getMessage(equCategory.substring(0, 1));
-
-                // 设备代码中间两位
-                String equipType2MidDigits = equCategory.substring(1, 3);
-                //台套还是取品种的中间两位
-                if (!isUnit) {
-                    if (!ValidationUtil.isEmpty(equDefine)) {
-                        equipType2MidDigits = equDefine.substring(1, 3);
-                    }
-                }
-                Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
-                String cityCode = Optional.ofNullable((String) changeData.get("transferCity"))
-                        .map(s -> s.split("_")[0])
-                        .orElse("");
-                String countyCode = Optional.ofNullable((String) changeData.get("transferCounty"))
-                        .map(s -> s.split("_")[0])
-                        .orElse("");
-                String isXiXian = "0".equals(changeData.get("transferIsXixian")) ? "0" : "1";
-                // 登记机关代号
-                String city = codeGenService.getSupervisorCodePrefix(isXiXian, cityCode, countyCode);
-                // 西咸新区监管码对应的设备使用登记证还按咸阳(D)生成
-                if ("X".equals(city)) {
-                    city = "D";
-                }
-                if (!ValidationUtil.isEmpty(supervisoryCompanyCode)) {
-                    DataDictionary specialRegionCode = dataDictionaryService.getByCode(supervisoryCompanyCode, SPECIAL_REGION_CODE);
-                    if (!ValidationUtil.isEmpty(specialRegionCode)) {
-                        city = specialRegionCode.getName();
-                    }
-                }
-                return generateUniqueUseRegistrationCode(equCategoryAbbrName, equipType2MidDigits, city);
-            }
-        }
-        return null;
-    }
-
-    /**
      * 检查实际状态是否不等于期望状态
      *
      * @param latestStatus 业务最新状态

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

@@ -1675,14 +1675,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     public String judgeTheBusinessAccordingByRecord(String record, Map<String, Object> objMap) {
         String business = "";
-        // 安装告知
-        Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetailByIdx(record);
-        if (!ObjectUtils.isEmpty(installDetail)) {
+        // TODO 兼容历史有证、无证数据，根本原因idx_biz_jg_construction_info施工信息字段不全，字段补全后还是要查idx_biz_jg_construction_info，否则改造告知
+        // 安装信息，优先查询安装告知信息没有再查设备的施工信息表
+        // 安装告知信息表查询，做过安装告知的施工信息优先
+        Map<String, Object> constructInfo = jgUseRegistrationMapper.getiInstallDetail(record);
+        if(constructInfo == null){
+            // 施工信息表查询
+            constructInfo = jgUseRegistrationMapper.getiInstallDetailByIdx(record);
+        }
+        if (!ObjectUtils.isEmpty(constructInfo)) {
             business = business + ",安装告知";
-            objMap.putAll(installDetail);
-            objMap.put("insOtherAccessories", JSON.parse(Optional.ofNullable(installDetail.get("insOtherAccessories")).orElse("").toString()));
-            objMap.put("installProxyStatementAttachment", JSON.parse(Optional.ofNullable(installDetail.get("installProxyStatementAttachment")).orElse("").toString()));
-            objMap.put("installContractAttachment", JSON.parse(Optional.ofNullable(installDetail.get("installContractAttachment")).orElse("").toString()));
+            objMap.putAll(constructInfo);
+            objMap.put("insOtherAccessories", JSON.parse(Optional.ofNullable(constructInfo.get("insOtherAccessories")).orElse("").toString()));
+            objMap.put("installProxyStatementAttachment", JSON.parse(Optional.ofNullable(constructInfo.get("installProxyStatementAttachment")).orElse("").toString()));
+            objMap.put("installContractAttachment", JSON.parse(Optional.ofNullable(constructInfo.get("installContractAttachment")).orElse("").toString()));
         }
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetailByIdx(record);

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

@@ -936,7 +936,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     Map<String, String> supervisoryCodeMap = this.create96333Code(historyData, device.getEquId());
                     supervisoryCode = supervisoryCodeMap.get("superviseCode");
                     code96333 = supervisoryCodeMap.get("code96333");
-                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(),historyData, transfer.getReceiveCompanyCode(), false));
+                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), transfer.getReceiveCompanyCode(), false));
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
                 } else {
@@ -958,7 +958,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         Map<String, String> supervisoryCodeMap = this.create96333Code(historyData, device.getEquId());
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
-                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), historyData, transfer.getReceiveCompanyCode(), false));
+                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), transfer.getReceiveCompanyCode(), false));
                         useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                         isUpdateRegistrationCode.set(true);
                     }

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

@@ -1347,8 +1347,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 }
                 JgUseRegistrationManage registrationManage=registrationManages.get(0);
                 registrationManage.setSequenceNbr(sequence.nextId());
-                String code = commonServiceImpl.generateRegistrationCode(changeRegistrationUnitEqs.get(0).getEquId(), idxBizJgProjectContraption.getSupervisoryCode(),
-                        registrationManage.getReceiveCompanyCode(), true);
+                String code = commonServiceImpl.generateRegistrationCode(changeRegistrationUnitEqs.get(0).getEquId(), registrationManage.getReceiveCompanyCode(), true);
                 registrationManage.setUseRegistrationCode(code);
                 //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
                 registrationManage.setUseUnitName(registration.getNewUseUnitName());

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

@@ -305,6 +305,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             JSONObject hisData = commonService.queryHistoryData(notice.getSequenceNbr());
             // 兼容老数据
             if (hisData == null) {
+                // todo companyLevel赋值这个不能少，控制前端页面的字段(安装负责人）显示隐藏
                 Map<String, Object> detail = setNewEquipData(companyLevel, installationInfo);
                 this.fillingEquCategoryNameForHisData(detail, notice);
                 return new HashMap<String, Map<String, Object>>() {{
@@ -314,12 +315,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 hisData.putAll(installationInfo);
                 CommonServiceImpl.formatTime2StrDateForEquip(hisData);
                 this.fillingEquCategoryNameForHisData(hisData, notice);
+                // todo 这个不能少 控制前端页面的字段(安装负责人）显示隐藏
+                hisData.put("companyLevel", companyLevel);
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put("installationInfo", hisData);
                 }};
             }
         } else {
             // 显示最新的设备信息
+            // todo companyLevel赋值这个不能少，控制前端页面的字段(安装负责人）显示隐藏
             Map<String, Object> detail = setNewEquipData(companyLevel, installationInfo);
             detail.put("startLatitudeLongitude", JSON.parseObject(notice.getStartLatitudeLongitude()));
             detail.put("endLatitudeLongitude", JSON.parseObject(notice.getEndLatitudeLongitude()));

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

@@ -1623,8 +1623,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         .map(Boolean.class::cast)
                         .orElse(false);
                 if ((Boolean) mapData.get("isFirstEquip")) {
-                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(),
-                            jgUseRegistration.getReceiveCompanyCode(), true);
+                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getReceiveCompanyCode(), true);
                     jgUseRegistration.setUseRegistrationCode(code);
                     jgUseRegistration.setAuditPassDate(new Date());
                     registerInfo.setUseOrgCode(code);
@@ -1646,7 +1645,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     idxBizJgRegisterInfoService.update(lambda);
                 }
             } else {
-                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode(), false);
+                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getReceiveCompanyCode(), false);
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
                 registerInfo.setUseOrgCode(code);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseUnitCreditCodeCategoryDto;
@@ -43,6 +44,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     Map<String, Object> getAdministrativeDivision(@Param("division") String division, @Param("county") String county);
 
+    DataDictionary getOneDictByTypeAndExtend(@Param("type") String type, @Param("regionCode") String regionCode);
 
     List<Map<String, Object>> getSrcee(@Param("tableName") String tableName,
                                        @Param("orgBranchName") String orgBranchName,

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -75,6 +75,19 @@
       AND extend LIKE CONCAT('%',#{county},'%')
     </select>
 
+    <select id="getOneDictByTypeAndExtend" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+        SELECT
+            code,
+            type,
+            type_desc
+        FROM
+            cb_data_dictionary
+        WHERE
+            type= #{type}
+            AND extend LIKE CONCAT('%',#{regionCode},'%')
+            limit 1
+    </select>
+
 
     <select id="getSrcee" resultType="java.util.Map">
         SELECT