fix(jg)：监管业务系统，维保备案申请时，设备列表中出现了历史设备

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

@@ -151,6 +151,7 @@
         where
             pc.org_code like concat (#{reginCode},'%')
             and tjurm.certificate_status = '已登记'
+            and tjurm.is_delete = 0
     </select>
     <select id="getRecords" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>

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

@@ -2139,6 +2139,7 @@ public class CommonServiceImpl implements ICommonService {
         LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode)
                 .eq(JgUseRegistrationManage::getEquDefineCode, equDefineCode)
+                .eq(JgUseRegistrationManage::getIsDelete,0)
                 .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
                 .orderByDesc(JgUseRegistrationManage::getCertificateNo);
         return jgUseRegistrationManageMapper.selectList(queryWrapper).stream()

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

@@ -89,6 +89,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
@@ -415,8 +416,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     private void checkEquCodeUniqueness(LinkedHashMap equipmentInfoForm) {
         // 根据设备代码检查唯一性
-        Integer count = idxBizJgRegisterInfoMapper.selectByEquCodeAndClaimStatus((String) equipmentInfoForm.get(EQU_CODE), (String) equipmentInfoForm.get(SEQUENCE_NBR));
-        if (count > 0) {
+        String equCode = (String) equipmentInfoForm.get(EQU_CODE);
+        String sequenceNbr = (String) equipmentInfoForm.get(SEQUENCE_NBR);
+        List<Integer> results = Stream.of(idxBizJgRegisterInfoMapper.selectByEquCodeAndClaimStatus(equCode, sequenceNbr),
+                idxBizJgRegisterInfoMapper.selectInstallNoticeEqByEquCode(equCode)
+        ).collect(Collectors.toList());
+
+        if (results.stream().anyMatch(count -> count > 0)) {
             throw new BadRequest("设备代码已存在，请重新输入！");
         }
     }
@@ -1488,21 +1494,26 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
         // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
         BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
-
+        String queryType = map.getString("QUERY_TYPE");
         if (map.containsKey("DATA_SOURCE") && !ObjectUtils.isEmpty(map.get("DATA_SOURCE"))) {
-            if ("jg_his".equals(map.get("DATA_SOURCE"))) {// 只查历史，前缀jg_his
+            String dataSource = map.getString("DATA_SOURCE");
+            if ("jg_his".equals(dataSource)) {
+                // 只查历史，前缀为 jg_his
                 dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
-            } else if (!"jg_his".equals(map.getString("DATA_SOURCE"))) {// 只查新增，前缀为jg且前缀不为jg_his
-                dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
-                dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            } else {
+                // 只查新增，前缀为 jg 且前缀不为 jg_his
+                dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"))
+                        .mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
             }
+        } else if (ValidationUtil.equals(queryType, "WB")) {
+            // 对于xWB类型查询，排除jg_his
+            dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
         } else {
-            // 查所有，前缀jg
+            // 查所有，前缀 jg
             dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
         }
         boolMust.must(dBuilder);
 
-        String queryType = map.getString("QUERY_TYPE");
         if (!ObjectUtils.isEmpty(queryType)) {
             // 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null ||  ""】
             if (ValidationUtil.equals(queryType, "AZ")) {// 安装

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

@@ -962,7 +962,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
 
         // 当企业下所有使用登记证单位信息都改为最新的时候再去修改系统中单位信息
-        Integer count = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode()).eq(JgUseRegistrationManage::getUseUnitName, jgChangeRegistrationName.getUseUnitName()).count();
+        Integer count = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode())
+                .eq(JgUseRegistrationManage::getIsDelete,0)
+                .eq(JgUseRegistrationManage::getUseUnitName, jgChangeRegistrationName.getUseUnitName()).count();
         if (count == 0) {
             // 修改企业信息
             LambdaUpdateWrapper<TzBaseEnterpriseInfo> updateWrapper2 = new LambdaUpdateWrapper<>();

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

@@ -452,7 +452,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         // 更新使用登记证信息
-        JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, object.get("useRegistrationCode")).one();
+        JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, object.get("useRegistrationCode"))
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
         useRegistrationCode.setAuditPassDate(new Date());
         jgUseRegistrationManageService.updateById(useRegistrationCode);
         // 生成业务流水信息

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

@@ -456,7 +456,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
     public void saveRecord(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode()).one();
+        JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
         // 业务流水生成
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
@@ -707,7 +710,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         HashMap<String, Object> map = new HashMap<>();
         // 组件回显
         map.put("useRegistrationCode", useRegistrationCode);
-        JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode).one();
+        JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
+                .eq(JgUseRegistrationManage::getIsDelete,0)
+                .one();
         List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());
         if (!ObjectUtils.isEmpty(jsonObjects)) {
 //            JgVehicleInformation information = jgVehicleInformationService.lambdaQuery().eq(JgVehicleInformation::getUseRegistrationCode, useRegistrationCode).one();

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

@@ -1033,6 +1033,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())){
             JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
             changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
         }

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

@@ -1573,6 +1573,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())){
             JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
             changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
         }
@@ -1890,6 +1891,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             this.getBaseMapper().updateById(vehicleInformation);
             JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .one();
             if (useRegistrationCode != null) {
                 useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());
@@ -2086,6 +2088,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         this.getBaseMapper().updateById(vehicleInformation);
         JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
                 .one();
         if (useRegistrationCode != null) {
             useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2673,6 +2673,7 @@ public class JGDPStatisticsServiceImpl {
         if(!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())){
             Optional<JgUseRegistrationManage> firstRecord = jgUseRegistrationManageMapper.selectList(new QueryWrapper<JgUseRegistrationManage>().lambda()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .orderByDesc(JgUseRegistrationManage::getRecDate)).stream().findFirst();
 
             firstRecord.ifPresent(jgUseRegistrationManage -> {

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

@@ -58,4 +58,6 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     Boolean updateCylinderCategoryByEquCodeBatch(@Param("cylinderCategory") String cylinderCategory, @Param("equCodeList") List<String> equCodeList);
 
     Integer selectByEquCodeAndClaimStatus(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
+
+    Integer selectInstallNoticeEqByEquCode(@Param("equCode") String equCode);
 }

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

@@ -29,6 +29,13 @@
 		AND joi.claim_status = '已认领'
 	</select>
 
+	<select id="selectInstallNoticeEqByEquCode" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM tzs_jg_installation_notice_eq tjine
+		JOIN idx_biz_jg_register_info ibjri ON ibjri.record = tjine.equ_id
+		WHERE ibjri.equ_code = #{equCode}
+	</select>
+
 	<update id="updateCylinderCategoryByRecordBatch">
 		UPDATE idx_biz_jg_register_info
 		SET "CYLINDER_CATEGORY" = #{cylinderCategory}