Newspaper пре 2 година
родитељ
комит
2ab35b0c47
1 измењених фајлова са 9 додато и 6 уклоњено
  1. 9 6
      src/main/resources/mapper/EnvWarningMapper.xml

+ 9 - 6
src/main/resources/mapper/EnvWarningMapper.xml

@@ -24,12 +24,15 @@
     <select id="listTop" resultType="com.huimv.admin.entity.vo.WarningTopVo">
         SELECT build_name as location,SUM(COUNT) as count
         FROM (
-            SELECT c.id,c.build_name, SUM((SELECT COUNT(w.id) FROM env_warning w WHERE a.id=w.unit_id )) COUNT
-            FROM base_pigpen a
-            INNER JOIN base_pigpen b ON a.parent_id =b.id
-            INNER JOIN base_pigpen c ON b.parent_id =c.id
-            WHERE a.farm_id = #{farmId}
-            GROUP BY c.build_name
+            SELECT c.id,c.build_name,
+            SUM((SELECT COUNT(w.id) FROM env_warning w
+                    WHERE a.id=w.unit_id AND w.update_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-01 00:00:00')
+                )) COUNT
+                FROM base_pigpen a
+                INNER JOIN base_pigpen b ON a.parent_id =b.id
+                INNER JOIN base_pigpen c ON b.parent_id =c.id
+                WHERE a.farm_id = #{farmId}
+                GROUP BY c.build_name
         ) AS subquery
         GROUP BY id
         ORDER BY COUNT DESC