饲料消耗

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

@@ -11,7 +11,7 @@
     m.month,
     COALESCE(ROUND(w.waterValue, 2), 0) AS waterValue,
     COALESCE(ROUND(e.electricityValue, 2), 0) AS electricityValue,
-    COALESCE(ROUND(f.feedValue, 2), 0) AS feedValue
+    COALESCE(ROUND(f.feedValue, 1), 0) AS feedValue
 FROM months m
 LEFT JOIN (
     SELECT
@@ -32,7 +32,7 @@ LEFT JOIN (
 LEFT JOIN (
     SELECT
         MONTH(call_date) AS MONTH,
-        SUM(duck_weight) AS feedValue
+        ROUND(SUM(duck_weight)/1000,1) AS feedValue
     FROM env_regular_call_feeding
     WHERE YEAR(call_date) = YEAR(CURDATE())
     GROUP BY MONTH(call_date)
@@ -44,7 +44,7 @@ ORDER BY m.month
       SELECT
     m.month,
     COALESCE(e.eggNum, 0) AS eggNum,
-    COALESCE(ROUND(f.feedValue, 2), 0) AS feedValue
+    COALESCE(ROUND(f.feedValue, 1), 0) AS feedValue
 FROM months m
 LEFT JOIN (
     SELECT
@@ -57,7 +57,7 @@ LEFT JOIN (
 LEFT JOIN (
     SELECT
         MONTH(call_date) AS MONTH,
-        SUM(duck_weight) AS feedValue
+        ROUND(SUM(duck_weight)/1000,1) AS feedValue
     FROM env_regular_call_feeding
     WHERE YEAR(call_date) = YEAR(CURDATE())
     And event_type = 0
@@ -71,7 +71,7 @@ ORDER BY m.month
     d.duck_num,
     COALESCE(e.eggNum, 0) AS eggNum,
     COALESCE(ROUND(d.now_weight, 2), 0) AS nowWeight,
-    COALESCE(ROUND(f.duckWeight, 2), 0) AS feedWeight,
+    COALESCE(ROUND(f.duckWeight, 1), 0) AS feedWeight,
     d.unit_name
 FROM base_duck_info d
 LEFT JOIN (
@@ -84,7 +84,7 @@ LEFT JOIN (
 LEFT JOIN (
     SELECT
         duck_num,
-        SUM(duck_weight) AS duckWeight
+        ROUND(SUM(duck_weight)/1000,1) AS duckWeight
     FROM env_regular_call_feeding
     WHERE DATE(call_date) = CURDATE()
     And event_type = 0

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

@@ -37,14 +37,14 @@
     </select>
 
     <select id="getFeed" resultType="java.math.BigDecimal">
-        SELECT COALESCE(ROUND(SUM(f.duck_weight),2),0) 'duckWeight' FROM `env_regular_call_feeding` f
+        SELECT COALESCE(ROUND(SUM(f.duck_weight)/1000,1),0) 'duckWeight' FROM `env_regular_call_feeding` f
         LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
         And f.event_type = 0
         ${ew.customSqlSegment}
     </select>
 
     <select id="listSixMonthFeed" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-        SELECT IFNUll(ROUND(SUM(f.duck_weight),2),0) 'duckWeight', f.call_date FROM `env_regular_call_feeding` f
+        SELECT IFNUll(ROUND(SUM(f.duck_weight)/1000,1),0) 'duckWeight', f.call_date FROM `env_regular_call_feeding` f
         LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
         WHERE f.farm_id = #{farmId} and d.unit_id in ${units}
         AND f.call_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
@@ -53,7 +53,7 @@
     </select>
 
     <select id="listSevenDayFeed" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-        SELECT IFNULL(ROUND(SUM(f.duck_weight), 2), 0) AS duckWeight, f.call_date
+        SELECT IFNULL(ROUND(SUM(f.duck_weight)/1000,1), 0) AS duckWeight, f.call_date
         FROM env_regular_call_feeding f
         LEFT JOIN base_duck_info d ON f.duck_id = d.id
         WHERE f.farm_id = #{farmId} and d.unit_id in ${units}