采食

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/BaseBuildingMapper.xml

@@ -34,7 +34,7 @@ LEFT JOIN (
         MONTH(call_date) AS MONTH,
         ROUND(SUM(duck_weight)/1000,1) AS feedValue
     FROM env_regular_call_feeding
-    WHERE YEAR(call_date) = YEAR(CURDATE())
+    WHERE YEAR(call_date) = YEAR(CURDATE()) AND event_type = 0
     GROUP BY MONTH(call_date)
 ) f ON m.month = f.month
 ORDER BY m.month

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -75,7 +75,7 @@
 FROM (
     SELECT IFNULL(SUM(duck_weight), 0) AS duckWeight, DATE_FORMAT(call_date, "%Y-%m-%d") AS call_date,duck_num
     FROM `env_regular_call_feeding`
-    WHERE duck_num = #{duckNum}
+    WHERE duck_num = #{duckNum} AND event_type = 0
     GROUP BY DATE_FORMAT(call_date, "%Y-%m-%d")
 ) t1
 LEFT JOIN (