fix(jg)：注销报废功能修改

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

@@ -2274,13 +2274,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 esEquipmentDto.setUSE_UNIT_NAME(company.getCompanyName());
             }
             esEquipmentCategoryList.add(esEquipmentDto);
-
-            // 生成tzs_jg_certificate_change_record_eq记录
-            JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
-            changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
-            changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
-            changeRecordEq.setProductCode(factoryInfo.getFactoryNum());//产品编号
-            certificateChangeRecordEqService.save(changeRecordEq);
+            if ("his".equals(equipInfoDto.getDataSource())){
+                // 生成tzs_jg_certificate_change_record_eq记录
+                JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
+                changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
+                changeRecordEq.setProductCode(factoryInfo.getFactoryNum());//产品编号
+                certificateChangeRecordEqService.save(changeRecordEq);
+            }
         });
         Optional.of(useInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgUseInfoService::saveBatch);
         Optional.of(designInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgDesignInfoService::saveBatch);
@@ -2290,10 +2291,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Optional.of(paramsVesselList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgTechParamsVesselService::saveBatch);
         Optional.of(inspectionDetectionInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgInspectionDetectionInfoService::saveBatch);
         Optional.of(esEquipmentCategoryList).filter(list -> !list.isEmpty()).ifPresent(esEquipmentCategory::saveAll);
-        // 生成证书管理表记录
-        JgUseRegistrationManage registrationManage = this.saveRegistrationManage(equipInfoDto, company);
-        // 生成一条tzs_jg_certificate_change_record记录
-        generateCertificateChangeRecord(registrationManage, changeRecordId);
+        if ("his".equals(equipInfoDto.getDataSource())){
+            // 生成证书管理表记录
+            JgUseRegistrationManage registrationManage = this.saveRegistrationManage(equipInfoDto, company);
+            // 生成一条tzs_jg_certificate_change_record记录
+            generateCertificateChangeRecord(registrationManage, changeRecordId);
+        }
         return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
     }
 

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

@@ -843,11 +843,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
 //        map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
         if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
-            IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-            idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
-            LambdaQueryWrapper<IdxBizJgUseInfo> wrapper = new LambdaQueryWrapper<>();
-            wrapper.in(IdxBizJgUseInfo::getRecord, equipIds);
-            idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper);
+            idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.BAOFEI.getCode());
             map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
 
             // 修改证管理表中的证的状态
@@ -876,11 +872,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             map1.put("ORG_BRANCH_CODE", "");
             map1.put("ORG_BRANCH_NAME", "");
             map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
-            IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-            idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
-            LambdaQueryWrapper<IdxBizJgUseInfo> wrapper1 = new LambdaQueryWrapper<>();
-            wrapper1.in(IdxBizJgUseInfo::getRecord, equipIds);
-            idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper1);
+            idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode());
 
             // 修改证管理表中的证的状态
             List<String> certificateIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getCertificateSeq).collect(Collectors.toList());

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 /**
  * 使用信息表 Mapper 接口
@@ -10,5 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-08-16
  */
 public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
-
+    void batchUpdateUseInfo(@Param("records") List<String> records, Integer code);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper">
 
+    <update id="batchUpdateUseInfo">
+        UPDATE idx_biz_jg_use_info SET "EQU_STATE" = #{code} WHERE "RECORD" IN
+        <foreach collection="records" separator="," item="record" open="(" close=")">
+            #{record}
+        </foreach>
+    </update>
 </mapper>