bugfix

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

@@ -140,7 +140,7 @@
             </if>
             <if test="dto.dataType != null and dto.dataType == 'supervision' ">
                 and (ur.receive_company_code = #{dto.receiveOrgCode} or (ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')))
-                AND ur.instance_id  <![CDATA[<>]]>  ''
+                AND ur.instanceId  <![CDATA[<>]]>  ''
             </if>
             <if test="dto.dataType != null and dto.dataType == 'company' ">
                 and (ur.use_unit_credit_code = #{dto.useUnitCreditCode} or (ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')))

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

@@ -18,6 +18,8 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -128,6 +130,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     @Autowired
     private OtherInfoMapper otherInfoMapper;
+    @Autowired
+    private ESEquipmentCategory esEquipmentCategory;
     //改造登记关系表mapper
     @Autowired
     private JgChangeRegistrationReformEqMapper jgChangeRegistrationReformEqMapper;
@@ -643,13 +647,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         // es
         List<JgChangeRegistrationReformEq> reformEqs = jgChangeRegistrationReformEqMapper.selectList(new LambdaQueryWrapper<JgChangeRegistrationReformEq>().eq(JgChangeRegistrationReformEq::getEquipTransferId, reform.getSequenceNbr()));
         reformEqs.forEach(reformEq -> {
-            Map<String, Map<String, Object>> resultMap = MapBuilder.<String, Map<String, Object>>create()
-                    .put(reformEq.getEquId(), MapBuilder.<String, Object>create()
-                            .put(USC_UNIT_NAME, null)
-                            .put(USC_UNIT_CREDIT_CODE, null)
-                            .build())
-                    .build();
-            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+            Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(reformEq.getEquId());
+            if (optional.isPresent()) {
+                ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+                esEquipmentCategoryDto.setUSC_UNIT_NAME(null);
+                esEquipmentCategoryDto.setUSC_UNIT_CREDIT_CODE(null);
+                esEquipmentCategory.save(esEquipmentCategoryDto);
+            }
         });
     }
 

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

@@ -1193,6 +1193,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新工程装置信息
             if (Objects.nonNull(jgProjectContraption)) {
                 jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
+                jgProjectContraption.setUscUnitCreditCode(null);
+                jgProjectContraption.setUscUnitName(null);
                 jgProjectContraptionService.updateById(jgProjectContraption);
             }
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种