fix: 监测部件接口“消防健康码”排序兼容卡片使用

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -671,8 +671,11 @@ public class FireFightingSystemController extends AbstractBaseController {
     @PostMapping(value = "/getMonitoringUnitList")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "查询监测部件列表", notes = "查询监测部件列表")
-    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage) {
-        return equipmentSpecificSerivce.getMonitoringUnitList(equipTypeAmountPage);
+    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(
+            @RequestBody EquipTypeAmountPageDTO equipTypeAmountPage,
+            @RequestParam(value = "useSource", required = false) String useSource
+    ) {
+        return equipmentSpecificSerivce.getMonitoringUnitList(equipTypeAmountPage, useSource);
     }
 
     @GetMapping(value = "/getMonitoringCount")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -308,7 +308,11 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getListByCode(@Param("code") String code, @Param("bizOrgCode") String bizOrgCode);
 
-    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@Param("page") IPage page,@Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage);
+    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(
+            @Param("page") IPage page,
+            @Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage,
+            @Param("useSource") String useSource
+    );
 
     List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

@@ -305,7 +305,7 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
 
     String updateEquipSpecificStatusByCheckInput( String id);
 
-    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage);
+    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage, String useSource);
 
     List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2169,8 +2169,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
-    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage) {
-        IPage<EquipTypeImgAmountVO> record = equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(), equipTypeAmountPage);
+    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage, String useSource) {
+        IPage<EquipTypeImgAmountVO> record = equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(), equipTypeAmountPage, useSource);
         record.getRecords().forEach(e -> {
             e.setEquip(equipmentSpecificMapper.getMonitoringEquip(String.valueOf(e.getId())).get("num").toString());
             e.setOther(equipmentSpecificMapper.getMonitoringOther(String.valueOf(e.getId())).get("num").toString());

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2673,7 +2673,12 @@
             </if>
             AND wed.equipment_name is not null
         </where>
-        ORDER BY  CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC ,  wes.create_date DESC
+        <if test="useSource == null or useSource == ''">
+            ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC ,  wes.create_date DESC
+        </if>
+        <if test="useSource == 'cardscreen'">
+            ORDER BY equipStatus DESC ,  wes.create_date DESC
+        </if>
     </select>
     <select id="getMonitoringCount" resultType="java.util.Map">
         SELECT
@@ -2691,10 +2696,10 @@
     </select>
 
     <select id="getMonitoringEquip" resultType="java.util.Map">
-       SELECT IFNULL(SUM(IF(aqr.SOURCE = 'equip', 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
+       SELECT IFNULL(SUM(IF(aqr.SOURCE = 'equip' AND aqr.TYPE = 'equipment' AND CLEAN_TIME IS NULL, 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
     </select>
     <select id="getMonitoringOther" resultType="java.util.Map">
-        SELECT IFNULL(SUM(IF(aqr.SOURCE != 'equip', 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
+        SELECT IFNULL(SUM(IF(aqr.SOURCE != 'equip' AND aqr.TYPE = 'equipment' AND CLEAN_TIME IS NULL, 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
     </select>
 
     <update id="updateEquipQrCode" parameterType="list">