21125 监管业务已纳管设备列表无法查询到一码通修改数据后的设备

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

@@ -442,7 +442,16 @@
         <include refid="page-list-pipeline"/>
         WHERE
         ri."EQU_CATEGORY" = '8300'
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
             and ui."DATA_SOURCE" like 'jg%'
+            and ui."DATA_SOURCE" not like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
+            and ui."DATA_SOURCE" like 'jg%'
+        </if>
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
@@ -506,6 +515,16 @@
         ri."EQU_CATEGORY" = '2300'
         and ui."DATA_SOURCE" like 'jg%'
         and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg%'
+            and ui."DATA_SOURCE" not like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
+            and ui."DATA_SOURCE" like 'jg%'
+        </if>
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}

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

@@ -2376,9 +2376,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         jsonObject.put("useUnitCreditCode", useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").getEquipInFlow(useUnitCreditCode);
-        if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
+        if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {//管道
             return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);
-        } else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
+        } else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {//气瓶
             List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
             Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
             Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records);