refactor(大编辑)：安装流水查询逻辑调整

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/FieldDisplayDefine.java

@@ -26,4 +26,10 @@ public @interface FieldDisplayDefine {
     String typeHandler() default "defaultTypeHandler";
 
     String dictCode() default "";
+
+    /**
+     * 是否冗余字段，如行政区划名称，冗余时则该字段不再记录变更日志
+     * @return 是否冗余
+     */
+    boolean isRepeatColumn() default false;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/FieldChangeMeta.java

@@ -66,4 +66,9 @@ public class FieldChangeMeta implements Serializable {
      */
     private FieldDisplayDefine fieldDisplayDefine;
 
+    /**
+     * 是否冗余字段（如行政区划对应的名称字段，在记录日志时不会冗余记录次）
+     */
+    private Boolean isRepeatColumn;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -58,7 +58,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getMaintenanceDetailByIdx(@Param("id") String id);
 
-    Map<String, Object> getiInstallDetail(@Param("id") String id);
+    Map<String, Object> getInstallDetail(@Param("id") String id);
 
     Map<String, Object> getiInstallDetailByIdx(@Param("id") String id);
 

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

@@ -654,26 +654,23 @@
         where jri.RECORD = #{record}
     </select>
 
-    <select id="getiInstallDetail" resultType="java.util.Map">
+    <select id="getInstallDetail" resultType="java.util.Map">
         SELECT
-            tjin."province_name"                     as  installProvince ,
-            tjin."city_name"                         as  installCity,
-            tjin."county_name"                       as  installCounty ,
-            tjin."street_name"                       as  installStreet ,
-            tjin."install_leader_name"               as  installLeaderName  ,
-            tjin."address"                           as  installAddress ,
-            tjin."is_xixian"                         as  installIsXixian ,
-            tjin."install_leader_name"               as  installLeaderName ,
-            tjin."install_leader_phone"              as  installLeaderPhone ,
-            tjin."install_start_date"                as  installStartDate ,
-            tjin."property_unit_name"                as  installPropertyUnitName ,
-            tjin."proxy_statement_attachment"        as  installProxyStatementAttachment ,
-            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"
-        WHERE tjine."equ_id" = #{id} AND tjin."notice_status" = '6616'
-            ORDER BY tjine."rec_date" desc
+            tjin."CONSTRUCTION_PROVINCE_NAME"        as  installProvince ,
+            tjin."CONSTRUCTION_CITY_NAME"            as  installCity,
+            tjin."CONSTRUCTION_COUNTY_NAME"          as  installCounty,
+            tjin."CONSTRUCTION_STREET_NAME"          as  installStreet,
+            tjin."CONSTRUCTION_LEADER_NAME"          as  installLeaderName,
+            tjin."CONSTRUCTION_ADDRESS"              as  installAddress,
+            tjin."CONSTRUCTION_IS_XI_XIAN"           as  installIsXixian,
+            tjin."CONSTRUCTION_LEADER_PHONE"         as  installLeaderPhone ,
+            tjin."USC_DATE"                          as  installStartDate ,
+            tjin."USC_UNIT_NAME"                     as  installPropertyUnitName ,
+            tjin."PROXY_STATEMENT_ATTACHMENT"        as  installProxyStatementAttachment ,
+            tjin."CONSTRUCTION_CONTRACT_ATTACHMENT"  as  installContractAttachment ,
+            tjin."CONSTRUCTION_OTHER_ACCESSORIES"    as  insOtherAccessories
+        FROM "idx_biz_jg_construction_info" AS tjin
+        WHERE tjin."RECORD" = #{id} order by tjin.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/controller/CommonController.java

@@ -744,7 +744,7 @@ public class CommonController extends BaseController {
                     jsonObject.putAll(maintenanceDetail);
                 }
                 // 安装信息
-                Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(equipId);
+                Map<String, Object> installDetail = jgUseRegistrationMapper.getInstallDetail(equipId);
                 if (!ObjectUtils.isEmpty(installDetail)) {
                     jsonObject.putAll(installDetail);
                 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/DefaultBizDataChangeHandler.java

@@ -22,6 +22,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEvent> implements IBizDataChangeHandleStrategy {
 
@@ -52,7 +53,8 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
     }
 
     private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject oData, ReginParams selectedOrgInfo) {
-        if (!allChangeColumns.isEmpty()) {
+        List<FieldChangeMeta> noPeatChangeFields = allChangeColumns.stream().filter(f-> !f.getIsRepeatColumn()).collect(Collectors.toList());
+        if (!noPeatChangeFields.isEmpty()) {
             BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
             bizRelationDataDto.setBizId(applyNo);
             bizRelationDataDto.setBizType(canHandleBizType());
@@ -64,7 +66,7 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
             bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
             bizRelationDataDto.setUnitName(selectedOrgInfo.getCompany().getCompanyName());
             bizRelationDataDto.setBizIsFinished(bizIsFinished(applyNo));
-            eventPublisher.publish(new BaseBizDataChangeEvent(this, bizRelationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
+            eventPublisher.publish(new BaseBizDataChangeEvent(this, bizRelationDataDto, noPeatChangeFields, RequestContext.cloneRequestContext()));
         }
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -4,7 +4,6 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.equip;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -23,6 +22,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.FormatService;
+import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.RegionCodeTypeHandler;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -120,6 +120,8 @@ public class CommonEquipDataProcessService {
 
     private final FormatService formatService;
 
+    private final RegionCodeTypeHandler regionCodeTypeHandler;
+
     private final IdxBizJgRegisterInfoServiceImpl jgRegisterInfoService;
 
     public static final String BASE_COLUMN_REC_DATE = "\"REC_DATE\"";
@@ -531,6 +533,7 @@ public class CommonEquipDataProcessService {
                     fieldChangeMeta.setColumnLabel(fieldName);
                     fieldChangeMeta.setChangeId(changeId);
                     fieldChangeMeta.setFieldDisplayDefine(displayDefine);
+                    fieldChangeMeta.setIsRepeatColumn(displayDefine.isRepeatColumn());
                     fieldChangeMeta.setColumnType(displayDefine.type().getSimpleName());
                     Object oV = field.get(beanData);
                     if (oV instanceof String) {
@@ -692,6 +695,7 @@ public class CommonEquipDataProcessService {
                         fieldChangeMeta.setColumnFamily(group.value());
                         fieldChangeMeta.setColumnLabel(fieldName);
                         fieldChangeMeta.setChangeId(changeId);
+                        fieldChangeMeta.setIsRepeatColumn(displayDefine.isRepeatColumn());
                         // 字段类型前端渲染时使用
                         fieldChangeMeta.setColumnType(displayDefine.type().getSimpleName());
                         if (newVal instanceof String) {
@@ -768,11 +772,11 @@ public class CommonEquipDataProcessService {
     }
 
     private String genDataSource(String dataSource) {
-        if(dataSource.contains("jg_his_black")) {
+        if (dataSource.contains("jg_his_black")) {
             return "black";
         } else if (dataSource.contains("jg_his")) {
             return "his";
-        } else  {
+        } else {
             return "new";
         }
     }
@@ -995,6 +999,30 @@ public class CommonEquipDataProcessService {
     }
 
 
+    /**
+     * 施工地点name冗余
+     *
+     * @param constructionInfo
+     */
+    public void setNameByCode2ConstructionInfo(IdxBizJgConstructionInfo constructionInfo) {
+        // 省
+        if (StringUtils.isNotEmpty(constructionInfo.getConstructionProvince())) {
+            constructionInfo.setConstructionProvinceName(regionCodeTypeHandler.handle(constructionInfo.getConstructionProvince()));
+        }
+        // 城市
+        if (StringUtils.isNotEmpty(constructionInfo.getConstructionCity())) {
+            constructionInfo.setConstructionCityName(regionCodeTypeHandler.handle(constructionInfo.getConstructionCity()));
+        }
+        // 区县
+        if (StringUtils.isNotEmpty(constructionInfo.getConstructionCounty())) {
+            constructionInfo.setConstructionCountyName(regionCodeTypeHandler.handle(constructionInfo.getConstructionCounty()));
+        }
+        // 街道
+        if (StringUtils.isNotEmpty(constructionInfo.getConstructionStreet())) {
+            constructionInfo.setConstructionStreetName(regionCodeTypeHandler.handle(constructionInfo.getConstructionStreet()));
+        }
+    }
+
     public void setNameByCode2UseInfo(IdxBizJgUseInfo useInfoNew) {
         // 1.使用地点name冗余
         // 市

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -96,6 +96,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
             IdxBizJgConstructionInfo constructionInfoNew = BeanUtil.copyProperties(constructionInfoOld, IdxBizJgConstructionInfo.class);
             CommonEquipDataProcessService.castMap2Bean(changeJson, constructionInfoNew);
             constructionInfoNew.setSequenceNbr(constructionInfoOld.getSequenceNbr());
+            commonEquipDataProcessService.setNameByCode2ConstructionInfo(constructionInfoNew);
             List<FieldChangeMeta> constructionInfoFieldChangeMetas = commonEquipDataProcessService.simpleTrackAndUpdate(commonEquipDataProcessService.getJgUseRegistrationService().getIdxBizJgConstructionInfoService().getBaseMapper(), constructionInfoOld, constructionInfoNew, useInfoNew.getRecord(), "SEQUENCE_NBR", constructionInfoOld.getSequenceNbr());
             allChangeColumns.addAll(constructionInfoFieldChangeMetas);
         }

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

@@ -1699,7 +1699,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             // TODO 兼容历史有证、无证数据，根本原因idx_biz_jg_construction_info施工信息字段不全，字段补全后还是要查idx_biz_jg_construction_info，否则改造告知
             // 安装信息，优先查询安装告知信息没有再查设备的施工信息表
             // 安装告知信息表查询，做过安装告知的施工信息优先
-            Map<String, Object> constructInfo = jgUseRegistrationMapper.getiInstallDetail(record);
+            Map<String, Object> constructInfo = jgUseRegistrationMapper.getInstallDetail(record);
             if(constructInfo == null){
                 // 施工信息表查询
                 constructInfo = jgUseRegistrationMapper.getiInstallDetailByIdx(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/JgInstallationNoticeServiceImpl.java

@@ -1538,6 +1538,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         idxBizJgConstructionInfo.setConstructionCounty(jgInstallationNotice.getCounty());
         idxBizJgConstructionInfo.setConstructionStreet(jgInstallationNotice.getFactoryUseSiteStreet());
         idxBizJgConstructionInfo.setConstructionAddress(jgInstallationNotice.getAddress());
+        idxBizJgConstructionInfo.setConstructionProvinceName(jgInstallationNotice.getProvinceName());
+        idxBizJgConstructionInfo.setConstructionCityName(jgInstallationNotice.getCityName());
+        idxBizJgConstructionInfo.setConstructionCountyName(jgInstallationNotice.getCountyName());
+        idxBizJgConstructionInfo.setConstructionStreetName(jgInstallationNotice.getStreetName());
+        idxBizJgConstructionInfo.setConstructionIsXiXian(jgInstallationNotice.getIsXixian());
 
         // 获取施工类型id
         LambdaQueryWrapper<DataDictionary> lambda = new LambdaQueryWrapper<>();

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

@@ -2254,7 +2254,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 设计信息
         Map<String, Object> desDetail = this.baseMapper.getDesDetail(record);
         // 安装信息
-        Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
+        Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
         // 维保信息
         Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(inspectDetail)) {
@@ -2958,7 +2958,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         fillLastEquipBaseInfo(jsonObject, record);
         // 安装信息
         if(!jsonObject.containsKey("installationIsComplete")) {
-            Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
+            Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
             // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
             if (ValidationUtil.isEmpty(installDetail)) {
                 installDetail = this.baseMapper.getiInstallDetailByIdx(record);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2942,7 +2942,7 @@ public class JGDPStatisticsServiceImpl {
     public String judgeTheBusinessAccordingByRecord(String record, Map<String, Object> objMap) {
         String business = "";
         // 安装告知
-        Map<String, Object> installDetail = useRegistrationMapper.getiInstallDetail(record);
+        Map<String, Object> installDetail = useRegistrationMapper.getInstallDetail(record);
         if (!ObjectUtils.isEmpty(installDetail)) {
             business = business + ",安装告知";
             objMap.putAll(installDetail);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgConstructionInfo.java

@@ -135,24 +135,45 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity implements IBaseChan
     @TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
     private String constructionOtherAccessories;
 
-    @FieldDisplayDefine(value = "施工区域-省", typeHandler = "regionCodeTypeHandler")
+    @FieldDisplayDefine(value = "施工区域-省行政区划", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_PROVINCE\"")
     private String constructionProvince;
 
-    @FieldDisplayDefine(value = "施工区域-市", typeHandler = "regionCodeTypeHandler")
+    @FieldDisplayDefine(value = "施工区域-市行政区划", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_CITY\"")
     private String constructionCity;
 
-    @FieldDisplayDefine(value = "施工区域-区/县", typeHandler = "regionCodeTypeHandler")
+    @FieldDisplayDefine(value = "施工区域-区/县行政区划", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_COUNTY\"")
     private String constructionCounty;
 
-    @FieldDisplayDefine(value = "施工区域-街道", typeHandler = "regionCodeTypeHandler")
+    @FieldDisplayDefine(value = "施工区域-街道行政区划", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_STREET\"")
     private String constructionStreet;
 
+    @FieldDisplayDefine(value = "施工区域-省名称", isRepeatColumn = true)
+    @TableField(value = "\"CONSTRUCTION_PROVINCE_NAME\"")
+    private String constructionProvinceName;
+
+    @FieldDisplayDefine(value = "施工区域-市名称", isRepeatColumn = true)
+    @TableField(value = "\"CONSTRUCTION_CITY_NAME\"")
+    private String constructionCityName;
+
+    @FieldDisplayDefine(value = "施工区域-区/县名称", isRepeatColumn = true)
+    @TableField(value = "\"CONSTRUCTION_COUNTY_NAME\"")
+    private String constructionCountyName;
+
+    @FieldDisplayDefine(value = "施工区域-街道名称", isRepeatColumn = true )
+    @TableField(value = "\"CONSTRUCTION_STREET_NAME\"")
+    private String constructionStreetName;
+
 
     @FieldDisplayDefine(value = "施工区域-详细地址")
     @TableField(value = "\"CONSTRUCTION_ADDRESS\"")
     private String constructionAddress;
+
+
+    @FieldDisplayDefine(value = "施工区域-是否西咸")
+    @TableField(value = "\"CONSTRUCTION_IS_XI_XIAN\"")
+    private String constructionIsXiXian;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -189,21 +189,21 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
     /**
      *
      */
-    @FieldDisplayDefine(value = "省份行政区划名称")
+    @FieldDisplayDefine(value = "省份行政区划名称", isRepeatColumn = true)
     @TableField("\"PROVINCE_NAME\"")
     private String provinceName;
 
     /**
      *
      */
-    @FieldDisplayDefine(value = "地市行政名称")
+    @FieldDisplayDefine(value = "地市行政名称", isRepeatColumn = true)
     @TableField("\"CITY_NAME\"")
     private String cityName;
 
     /**
      *
      */
-    @FieldDisplayDefine(value = "区县行政区划名称")
+    @FieldDisplayDefine(value = "区县行政区划名称", isRepeatColumn = true)
     @TableField("\"COUNTY_NAME\"")
     private String countyName;
 
@@ -248,7 +248,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
 
 
     @TableField("\"STREET_NAME\"")
-    @FieldDisplayDefine(value = "街道行政区划名称")
+    @FieldDisplayDefine(value = "街道行政区划名称", isRepeatColumn = true)
     private String streetName;
 
     /**