Merge branch 'develop_tzs_bugfix' of http://36.40.66.175:5000/moa/amos-boot-biz…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -123,6 +123,16 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     Integer checkFactoryNumUniquenessForVehicleCylinder(String factoryNum,String sequenceNbr);
 
     /**
+     * 查询出厂编码是否重复
+     * @param factoryNum 出厂编码
+     * @param sequenceNbr id
+     * @return Integer
+     */
+    Integer checkFactoryNumUnique(@Param("factoryNum") String factoryNum,
+                                  @Param("sequenceNbr") String sequenceNbr,
+                                  @Param("useUnitCreditCode") String useUnitCreditCode);
+
+    /**
      * 使用登记证编号全库唯一校验
      * @param useRegistrationCode
      * @return

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

@@ -903,6 +903,20 @@
         </if>
     </select>
 
+    <select id="checkFactoryNumUnique" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM
+        "idx_biz_jg_factory_info" ibjfi
+        JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
+        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjri."RECORD" = ibjui."RECORD"
+        WHERE
+        ibjri."EQU_LIST" = '2000'
+        AND ibjri."EQU_CATEGORY" = '2300'
+        AND ibjfi."FACTORY_NUM" = #{factoryNum}
+        AND ibjui."USE_UNIT_CREDIT_CODE" = #{useUnitCreditCode}
+    </select>
+
     <select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">
         SELECT COUNT( 1 )
         FROM idx_biz_jg_register_info jri

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

@@ -205,6 +205,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
     @Autowired
     private IdxBizJgConstructionInfoMapper constructionInfoMapper;
+    @Autowired
+    private SuperviseInfoMapper superviseInfoMapper;
 
     /**
      * @param auditPassDate   通过时间
@@ -2425,16 +2427,40 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setNextExecuteUserIds("");
         jgUseRegistration.setPromoter("");
         this.updateById(jgUseRegistration);
-        // 2.更新关联的业务
-        processElseDataByStatus(oldStatus, jgUseRegistration);
         List<JgUseRegistrationEq> eqList = getJgUseRegistrationEqs(jgUseRegistration);
+        List<String> records = eqList.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
+        //判断是否为批量导入数据，作废后删除设备信息
+        if("1".equals(jgUseRegistration.getRegType()) && "unit".equals(jgUseRegistration.getManageType())){
+            // 构建设备删除的 DTO 列表
+            List<ESEquipmentCategoryDto> esDtoList = records.stream().map(v -> {
+                ESEquipmentCategoryDto esDto = new ESEquipmentCategoryDto();
+                esDto.setSEQUENCE_NBR(v);
+                return esDto;
+            }).collect(Collectors.toList());
+            //删除涉及的19张表的数据
+            superviseInfoMapper.deleteDataAll(records);
+            //删除es中的数据
+            esEquipmentCategory.deleteAll(esDtoList);
+        }else{
+            // 处理非批量导入数据，更新关联业务状态
+            processElseDataByStatus(oldStatus, jgUseRegistration);
+            // 注册事务提交后的操作
+            registerAfterCommitTask(records);
+        }
+        return jgUseRegistration;
+    }
+
+    /**
+     * 注册事务提交后的同步操作
+     */
+    private void registerAfterCommitTask(List<String> records) {
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override
             public void afterCommit() {
-                eventPublisher.publish(new CancellationEvent(this, eqList.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList())));
+                // 发布作废事件
+                eventPublisher.publish(new CancellationEvent(this, records));
             }
         });
-        return jgUseRegistration;
     }
 
     private void clearUseInfoOfEquip(JgUseRegistration jgUseRegistration) {