代码提交

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

@@ -295,7 +295,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 
-    String getMonitoringEquip(String id);
+    Map<String, Object> getMonitoringEquip(String id);
 
-    String getMonitoringOther(String id);
+    Map<String, Object> getMonitoringOther(String id);
 }

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

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

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

@@ -2633,10 +2633,10 @@
                 GROUP BY code
     </select>
 
-    <select id="getMonitoringEquip" resultType="java.lang.String">
+    <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>
-    <select id="getMonitoringOther" resultType="java.lang.String">
+    <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>