Merge branch 'develop_tzs_main' of http://39.100.92.250:5000/moa/amos-boot-biz…

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

@@ -20,7 +20,6 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.Date;
@@ -368,6 +367,8 @@ public class EquipChangeDataUpdateServiceImpl {
         esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(idxBizJgUseInfo.getUseUnitCreditCode());
         esEquipmentCategoryDto.setUSE_UNIT_NAME(idxBizJgUseInfo.getUseUnitName());
         esEquipmentCategoryDto.setUSE_INNER_CODE(idxBizJgUseInfo.getUseInnerCode());
+        esEquipmentCategoryDto.setUSC_UNIT_NAME(idxBizJgUseInfo.getUscUnitName());
+        esEquipmentCategoryDto.setUSC_UNIT_CREDIT_CODE(idxBizJgUseInfo.getUscUnitCreditCode());
     }
 
     public void buildOtherInfoEsData(ESEquipmentCategoryDto esEquipmentCategoryDto, IdxBizJgOtherInfo data) {

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

@@ -436,8 +436,8 @@ public class DataDockServiceImpl {
                 useInfo.setUseUnitCreditCode(company.getCompanyCode());
                 useInfo.setUseUnitName(company.getCompanyName());
             } else if (company != null && "安装改造维修单位".equals(company.getCompanyType())){
-                useInfo.setUSC_UNIT_CREDIT_CODE(company.getCompanyCode());
-                useInfo.setUSC_UNIT_NAME(company.getCompanyName());
+                useInfo.setUscUnitCreditCode(company.getCompanyCode());
+                useInfo.setUscUnitName(company.getCompanyName());
             }else{
                 useInfo.setUseUnitCreditCode(MapUtil.getStr(equ,"useUnitCode"));
                 useInfo.setUseUnitName(MapUtil.getStr(equ, "useUnit"));

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

@@ -3777,8 +3777,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             useInfo.setUseUnitName(companyInfoMap.get("companyName").toString());
         }
         if (companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
-            useInfo.setUSC_UNIT_CREDIT_CODE(companyCode);
-            useInfo.setUSC_UNIT_NAME(companyName);
+            useInfo.setUscUnitCreditCode(companyCode);
+            useInfo.setUscUnitName(companyName);
         }
         if (OPERATESAVE.equals(operateType)) {
             useInfo.setCreateDate(date);

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

@@ -772,8 +772,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             // 数据库表清空
             LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(IdxBizJgUseInfo::getRecord, reformEq.getEquId());
-            updateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_CREDIT_CODE, null);
-            updateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_NAME, null);
+            updateWrapper.set(IdxBizJgUseInfo::getUscUnitCreditCode, null);
+            updateWrapper.set(IdxBizJgUseInfo::getUscUnitName, null);
             idxBizJgUseInfoService.update(updateWrapper);
         });
     }

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

@@ -680,8 +680,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private void writeUsc2UseInfo(JgEquipTransferEq equipTransferEq, JgEquipTransfer jgEquipTransfer) {
         LambdaUpdateWrapper<IdxBizJgUseInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(IdxBizJgUseInfo::getRecord, equipTransferEq.getEquId());
-        lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_CREDIT_CODE, jgEquipTransfer.getInstallUnitCreditCode());
-        lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_NAME, jgEquipTransfer.getInstallUnitName());
+        lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUscUnitCreditCode, jgEquipTransfer.getInstallUnitCreditCode());
+        lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUscUnitName, jgEquipTransfer.getInstallUnitName());
         idxBizJgUseInfoServiceImpl.update(lambdaUpdateWrapper);
     }
 

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

@@ -1731,8 +1731,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         idxBizJgUseInfo.setStreetName(jgInstallationNotice.getStreetName());
         idxBizJgUseInfo.setAddress(jgInstallationNotice.getAddress());
         idxBizJgUseInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian());
-        idxBizJgUseInfo.setUSC_UNIT_NAME(jgInstallationNotice.getInstallUnitName());
-        idxBizJgUseInfo.setUSC_UNIT_CREDIT_CODE(jgInstallationNotice.getInstallUnitCreditCode());
+        idxBizJgUseInfo.setUscUnitName(jgInstallationNotice.getInstallUnitName());
+        idxBizJgUseInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode());
         if ("8100".equals(jgInstallationNotice.getEquCategoryCode()) || "8200".equals(jgInstallationNotice.getEquCategoryCode())) {
             idxBizJgUseInfo.setEquState(String.valueOf(EquipmentEnum.ZAIYONG.getCode()));
         }

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

@@ -1959,8 +1959,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfo.setUseDate(Objects.toString(mapData.get("useDate"), ""));
-        useInfo.setUSC_UNIT_CREDIT_CODE("");
-        useInfo.setUSC_UNIT_NAME("");
+        useInfo.setUscUnitCreditCode("");
+        useInfo.setUscUnitName("");
         useInfoMapper.updateById(useInfo);
         // 更新es
         return updateEsData(usePlace, mapData, otherInfo, useInfo, jgUseRegistration, jsonObject);

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

@@ -55,6 +55,7 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity implements IBaseChan
      *
      */
     @TableField("\"USC_UNIT_CREDIT_CODE\"")
+    @FieldDisplayDefine(value = "施工单位信用代码")
     private String uscUnitCreditCode;
 
     /**

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

@@ -341,13 +341,13 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      * 安改维单位code-安装告知、移交后写入，登记后清除
      */
     @TableField("\"USC_UNIT_CREDIT_CODE\"")
-    private String USC_UNIT_CREDIT_CODE;
+    private String uscUnitCreditCode;
 
     /**
      * 安改维单位统名称-安装告知、移交后写入，登记后清除
      */
     @TableField("\"USC_UNIT_NAME\"")
-    private String USC_UNIT_NAME;
+    private String uscUnitName;
 
     @TableField(exist = false)
     @FieldDisplayDefine(value = "接收单位", typeHandler = "companyCodeTypeHandler")