bugfix：认领可以修改设备品种

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

@@ -744,6 +744,7 @@ public class EquipClaimServiceImpl {
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgRegisterInfo.class);
         registerInfo.setRecord(record);
         registerInfo.setRecDate(timestamp);
+        registerInfo.setEquDefine(ValidationUtil.isEmpty(Objects.toString(equipInfo.get("EQU_DEFINE"), null)) ? "" : Objects.toString(equipInfo.get("EQU_DEFINE"), null));
         registerInfo.setRegisterState(jgRegisterInfoService.getRegCode());
         registerInfo.setUseOrgCode(Objects.toString(equipInfo.get("useRegistrationCode"), null));
         registerInfo.setProductPhoto(ValidationUtil.isEmpty(equipInfo.get("PRODUCT_PHOTO")) ? null : toJSONString(equipInfo.get("PRODUCT_PHOTO")));
@@ -825,7 +826,7 @@ public class EquipClaimServiceImpl {
 
         String equListName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_LIST"));
         String equCategoryName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_CATEGORY"));
-        String equDefineName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_DEFINE"));
+        String equDefineName = jgVehicleInformationMapper.getEquCategoryNameByCode(Objects.toString(equipInfo.get("EQU_DEFINE"), null));
         // 是否工业管道
         boolean isGYGD = "8300".equals(equipInfo.get("EQU_CATEGORY").toString());
         // 1. 本单位下无该工程装置
@@ -1001,7 +1002,7 @@ public class EquipClaimServiceImpl {
         // 证管理表
         String equListName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_LIST"));
         String equCategoryName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_CATEGORY"));
-        String equDefineName = jgVehicleInformationMapper.getEquCategoryNameByCode((String) equipInfo.get("EQU_DEFINE"));
+        String equDefineName = jgVehicleInformationMapper.getEquCategoryNameByCode(Objects.toString(equipInfo.get("EQU_DEFINE"), null));
         Map<String, String> equType = new HashMap<>();
         equType.put("equListCode", equipInfo.get("EQU_LIST").toString());
         equType.put("equCategoryCode", equipInfo.get("EQU_CATEGORY").toString());
@@ -1010,7 +1011,7 @@ public class EquipClaimServiceImpl {
                 .equList(equListName)
                 .equCategoryCode(equipInfo.get("EQU_CATEGORY").toString())
                 .equCategory(equCategoryName)
-                .equDefineCode(equipInfo.get("EQU_DEFINE").toString())
+                .equDefineCode(Objects.toString(equipInfo.get("EQU_DEFINE"), null))
                 .equDefine(equDefineName)
                 .useUnitName(company.getCompanyName())
                 .useUnitCreditCode(company.getCompanyCode())
@@ -1145,7 +1146,7 @@ public class EquipClaimServiceImpl {
         List<IdxBizJgTechParamsPipeline> toUpdateParamsPipelineList = initializeList();
         List<IdxBizJgTechParamsPipeline> toAddParamsPipelineList = initializeList();
         List<ESEquipmentCategoryDto> esEquipmentCategoryList = initializeList();
-        String equCode = this.getEquCode(equipInfo.get("EQU_LIST").toString(), equipInfo.get("EQU_CATEGORY").toString(), equipInfo.get("EQU_DEFINE").toString(), new Date(), Objects.toString(equipInfo.getString("receiveOrgCode"), "").split("_")[0]);
+        String equCode = this.getEquCode(equipInfo.get("EQU_LIST").toString(), equipInfo.get("EQU_CATEGORY").toString(), Objects.toString(equipInfo.get("EQU_DEFINE"), null), new Date(), Objects.toString(equipInfo.getString("receiveOrgCode"), "").split("_")[0]);
         projectContraption.setEquCode(equCode);
         // 设备信息
         for (Map<String, Object> pipeline : pipelineList) {