1.历史登记时增加96333码的选择性录入

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

@@ -2342,17 +2342,17 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (isCopy) {
             // 设备状态置空
-            useInfo.setEquState(null);
+            useInfo.setEquState("");
             // 如果为安改维单位复制设备，则将使用单位信息置空
             if (companyTypeStr.equals(CompanyTypeEnum.CONSTRUCTION.getCode())) {
-                useInfo.setUseUnitCreditCode(null);
-                useInfo.setUseUnitName(null);
+                useInfo.setUseUnitCreditCode("");
+                useInfo.setUseUnitName("");
             }
             // 如果既为安改维单位又是使用单位，则将厂车、起重机械-流动式起重机、压力容器-气瓶安改维单位信息置空
             if (companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode()) && companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
                 if (!registerInfo.getEquList().equals("5000") && !registerInfo.getEquCategory().equals("4400") && !registerInfo.getEquCategory().equals("2300")) {
-                    constructionInfo.setUscUnitCreditCode(null);
-                    constructionInfo.setUscUnitName(null);
+                    constructionInfo.setUscUnitCreditCode("");
+                    constructionInfo.setUscUnitName("");
                 }
             }
         }
@@ -2386,14 +2386,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (isCopy) {
             if (companyTypeStr.equals(CompanyTypeEnum.USE.getCode()) || companyTypeStr.equals(CompanyTypeEnum.INDIVIDUAL.getCode())) {
-                constructionInfo.setUscUnitCreditCode(null);
-                constructionInfo.setUscUnitName(null);
+                constructionInfo.setUscUnitCreditCode("");
+                constructionInfo.setUscUnitName("");
             }
             // 如果既为安改维单位又是使用单位，则将厂车、起重机械-流动式起重机、压力容器-气瓶安改维单位信息置空
             if (companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode()) && companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
                 if (registerInfo.getEquList().equals("5000") || registerInfo.getEquCategory().equals("4400") || registerInfo.getEquCategory().equals("2300")) {
-                    constructionInfo.setUscUnitCreditCode(null);
-                    constructionInfo.setUscUnitName(null);
+                    constructionInfo.setUscUnitCreditCode("");
+                    constructionInfo.setUscUnitName("");
                 }
             }
         }
@@ -2409,7 +2409,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 补丁：saveOrUpdate在update数据时不会更新字段为null的字段，但是编辑设备的代码时，从有改成无，equCode解析成null，但是此时需要将equcode删掉
         registerInfo.setEquCode(ObjectUtils.isEmpty(registerInfo.getEquCode()) ? "" : registerInfo.getEquCode());
         // copy设备 =》 使用登记证号置空
-        registerInfo.setUseOrgCode(isCopy ? null : registerInfo.getUseOrgCode());
+        registerInfo.setUseOrgCode(isCopy ? "" : registerInfo.getUseOrgCode());
         this.saveOrUpdate(registerInfo);
 
         // 维保备案