fix(jg):台套认领bugfix

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

@@ -786,6 +786,9 @@ public class CommonEquipDataProcessService {
         IdxBizJgConstructionInfo constructionInfo = jgUseRegistrationService.getIdxBizJgConstructionInfoService().queryNewestDetailByRecord(record);
         BaseTechParamsFieldDto techParamsFieldDto = this.buildTechParamInfo(registerInfo, record);
         re.putAll(BeanUtil.beanToMap(useInfo));
+        // 移除useInfo中的施工（安装）单位code和name，避免对constructionInfo数据产生影响
+        re.remove("USC_UNIT_NAME");
+        re.remove("USC_UNIT_CREDIT_CODE");
         re.putAll(BeanUtil.beanToMap(registerInfo));
         re.putAll(BeanUtil.beanToMap(factoryInfo));
         re.putAll(BeanUtil.beanToMap(otherInfo));

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

@@ -765,7 +765,7 @@ public class EquipClaimServiceImpl {
         useInfo.setIsIntoManagement(isIntoManagement);
         useInfo.setUseUnitCreditCode(company.getCompanyCode());
         useInfo.setUseUnitName(company.getCompanyName());
-        useInfo.setSequenceNbr(Objects.toString(equipInfo.get("USEINFO_SEQ")));
+        useInfo.setSequenceNbr(Objects.toString(equipInfo.get("USEINFO_SEQ"), null));
         // 产权单位
         if (!ObjectUtils.isEmpty(equipInfo.getString("estateUnitSeq"))) {
             String estateUnitSeq = equipInfo.getString("estateUnitSeq");
@@ -830,7 +830,7 @@ public class EquipClaimServiceImpl {
         registerInfo.setUseOrgCode(Objects.toString(equipInfo.get("useRegistrationCode"), null));
         registerInfo.setProductPhoto(ValidationUtil.isEmpty(equipInfo.get("PRODUCT_PHOTO")) ? null : toJSONString(equipInfo.get("PRODUCT_PHOTO")));
         registerInfo.setOtherAccessoriesReg(ValidationUtil.isEmpty(equipInfo.get("OTHER_ACCESSORIES_REG")) ? null : toJSONString(equipInfo.get("OTHER_ACCESSORIES_REG")));
-        registerInfo.setSequenceNbr(Objects.toString(equipInfo.get("REGISTERINFO_SEQ")));
+        registerInfo.setSequenceNbr(Objects.toString(equipInfo.get("REGISTERINFO_SEQ"), null));
         jgRegisterInfoService.saveOrUpdate(registerInfo);
         // 监督管理
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgSupervisionInfo.class);
@@ -843,7 +843,7 @@ public class EquipClaimServiceImpl {
         otherInfo.setRecord(record);
         otherInfo.setClaimStatus("已认领");
         otherInfo.setRecDate(timestamp);
-        otherInfo.setSequenceNbr(Objects.toString(equipInfo.get("OTHERINFO_SEQ")));
+        otherInfo.setSequenceNbr(Objects.toString(equipInfo.get("OTHERINFO_SEQ"), null));
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
         // 检验检测信息
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgInspectionDetectionInfo.class);
@@ -856,7 +856,7 @@ public class EquipClaimServiceImpl {
         if (inspectionDetectionInfo.getNextInspectDate() != null) {
             inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)));
         }
-        inspectionDetectionInfo.setSequenceNbr(Objects.toString(equipInfo.get("INSPECTIONDETECTIONINFO_SEQ")));
+        inspectionDetectionInfo.setSequenceNbr(Objects.toString(equipInfo.get("INSPECTIONDETECTIONINFO_SEQ"), null));
         iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
         // 技术参数
         jgRegisterInfoService.saveOrUpdateEquParams(new LinkedHashMap<>(equipInfo), new LinkedHashMap<>(equipParams), equList, record, timestamp, "edit");