修改：变更登记时，废弃相关联的表

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationNameEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  *  Mapper 接口
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgChangeRegistrationNameEqMapper extends BaseMapper<JgChangeRegistrationNameEq> {
 
+    @Update ("update tzs_jg_change_registration_name_eq set  is_invalid = 1 where equ_id = #{equipId} and name_change_registration_id != #{currentDocumentId} ")
+    void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param ("equipId")String equipId, @Param("currentDocumentId")String currentDocumentId);
 }

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 单位变更登记设备关系表 Mapper 接口
@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-12-22
  */
 public interface JgChangeRegistrationUnitEqMapper extends CustomBaseMapper<JgChangeRegistrationUnitEq> {
-
+    @Update ("update tzs_jg_change_registration_unit_eq set  is_invalid = 1 where equ_id = #{equipId} and unit_change_registration_id != #{currentDocumentId} ")
+    void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param ("equipId")String equipId, @Param("currentDocumentId")String currentDocumentId);
 }

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

@@ -15,9 +15,11 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationNameEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationUnitEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferEqService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
@@ -28,7 +30,6 @@ import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
@@ -107,6 +108,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     //使用登记关系表mapper
     @Autowired
     private JgUseRegistrationEqMapper jgUseRegistrationEqMapper;
+    //单位变更登记关系表mapper
+    @Autowired
+    private JgChangeRegistrationUnitEqMapper jgChangeRegistrationUnitEqMapper;
+    //更名变更登记关系表mapper
+    @Autowired
+    private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
     @Autowired
     private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
@@ -150,11 +157,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
         }
         //查询申请单号
-        ResponseModel<List<String>> result =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZBG.getCode(), 1);
-        if(!result.getResult().isEmpty()){
+        ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZBG.getCode(), 1);
+        if (!result.getResult().isEmpty()) {
             //申请编号
             oldTransfer.setApplyNo(result.getResult().get(0));
-        }else {
+        } else {
             throw new BadRequest("申请单编号生成失败,请稍后重试!");
         }
 
@@ -219,9 +226,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 if (!ValidationUtil.isEmpty(dto2.get("SUPERVISORY_CODE"))) {
                     supervisoryCode = (String) dto2.get("SUPERVISORY_CODE");
                     oldTransfer.setSupervisoryCode(supervisoryCode);
-                }else{
+                } else {
                     supervisoryCode = idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(equId);
-                    if(!ValidationUtil.isEmpty(supervisoryCode)){
+                    if (!ValidationUtil.isEmpty(supervisoryCode)) {
                         oldTransfer.setSupervisoryCode(supervisoryCode);
                     }
                 }
@@ -251,11 +258,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 if (!ValidationUtil.isEmpty(dto2.get("INSTALL_UNIT_NAME"))) {
                     oldTransfer.setSupervisoryCode((String) dto2.get("INSTALL_UNIT_NAME"));
                 }
-
-
             }
 
-
             //保存【移装变更登记】基本信息
             if (!ValidationUtil.isEmpty(oldTransfer)) {
                 this.saveOrUpdate(oldTransfer);
@@ -501,7 +505,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 resultDataMap.put("province", useInfoByRecord.getProvince() + "_" + useInfoByRecord.getProvinceName());
                 resultDataMap.put("city", useInfoByRecord.getCity() + "_" + useInfoByRecord.getCityName());
                 resultDataMap.put("county", useInfoByRecord.getCounty() + "_" + useInfoByRecord.getCountyName());
-                resultDataMap.put("street", useInfoByRecord.getFactoryUseSiteStreet()+"_"+useInfoByRecord.getStreetName());
+                resultDataMap.put("street", useInfoByRecord.getFactoryUseSiteStreet() + "_" + useInfoByRecord.getStreetName());
                 resultDataMap.put("address", useInfoByRecord.getAddress());
                 if (!ObjectUtils.isEmpty(useInfoByRecord.getLongitudeLatitude())) {
                     resultDataMap.put("longitudeLatitude", JSON.parseObject(useInfoByRecord.getLongitudeLatitude()));
@@ -510,7 +514,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (!ValidationUtil.isEmpty(registerInfo)) {
                 resultDataMap.put("equCode", registerInfo.getEquCode());
             }
-            resultDataMap.put("receiveOrgCode", transferById.getReceiveOrgCode()+"_"+transferById.getReceiveOrgName());
+            resultDataMap.put("receiveOrgCode", transferById.getReceiveOrgCode() + "_" + transferById.getReceiveOrgName());
         }
 
         if (!resultDataMap.isEmpty()) {
@@ -626,7 +630,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             updateData.setRegPersonName(reginParams.getUserModel().getUserName());
             //使用登记证编号
             String useRegistrationCode = this.getCode(supervisoryCode);
-            if(!ValidationUtil.isEmpty(useRegistrationCode)){
+            if (!ValidationUtil.isEmpty(useRegistrationCode)) {
                 updateData.setUseRegistrationCode(useRegistrationCode);
             }
             //补充移装变更表
@@ -635,7 +639,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             this.replacementHistoryData(transferEq.getEquId(), sequenceNbr, useRegistrationCode);
             //更新使用注册登记证编号及ES中的信息
             this.updataRegisterInfoAndEsData(transferEq.getEquId(), useRegistrationCode);
-            //修改告知书状态，置为废弃
+            //修改各类告知列表，置为废弃
             this.updataInvalidStatusByHistory(transferEq.getEquId(), transferEq.getEquipTransferId());
         }
     }
@@ -647,7 +651,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param sequenceNbr         当前单据Id
      * @param useRegistrationCode 使用登记编号
      */
-    public void replacementHistoryData(String record, String sequenceNbr,String useRegistrationCode) {
+    public void replacementHistoryData(String record, String sequenceNbr, String useRegistrationCode) {
         //查询修改后的新数据
         JgRegistrationHistory newData = jgRegistrationHistoryService.getDteailByRecord(record, sequenceNbr);
         //查询设备旧数据
@@ -655,7 +659,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
         //更新历史数据表
         newData.setStatus("history");
-        if(!ValidationUtil.isEmpty(useRegistrationCode)){
+        if (!ValidationUtil.isEmpty(useRegistrationCode)) {
             newData.setUseRegistrationCode(useRegistrationCode);
         }
         jgRegistrationHistoryService.saveOrUpdateHistoryData(newData);
@@ -709,15 +713,22 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     }
 
     /**
-     * 修改告知书状态，置为废弃
+     * 修改各类告知列表，置为废弃
      *
      * @param equId           设备id
      * @param equipTransferId 当前告知单Id
      */
     public void updataInvalidStatusByHistory(String equId, String equipTransferId) {
+        //改造变更登记
         jgChangeRegistrationReformEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equId, equipTransferId);
+        //移装变更登记
         jgChangeRegistrationTransferEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equId, equipTransferId);
+        //使用登记
         jgUseRegistrationEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equId, equipTransferId);
+        //单位变更登记
+        jgChangeRegistrationUnitEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equId, equipTransferId);
+        //更名变更登记
+        jgChangeRegistrationNameEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equId, equipTransferId);
     }
 
     /**
@@ -743,7 +754,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     }
 
 
-
     /**
      * 参数为监管码
      *