首页能耗月份显示

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/ScreenEnergyVo.java

@@ -6,7 +6,7 @@ import java.math.BigDecimal;
 
 @Data
 public class ScreenEnergyVo {
-    private String quarter;
+    private String month;
     private BigDecimal waterValue;
     private BigDecimal electricityValue;
     private BigDecimal feedValue;

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

@@ -8,36 +8,36 @@
 
    <select id="listScreenEnergy" resultType="com.huimv.guowei.admin.entity.vo.ScreenEnergyVo">
     SELECT
-    q.quarter,
+    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
-FROM quarters q
+FROM months m
 LEFT JOIN (
     SELECT
-        QUARTER(create_date) AS QUARTER,
+        MONTH(create_date) AS MONTH,
         SUM(water_value) AS waterValue
     FROM energy_water
     WHERE YEAR(create_date) = YEAR(CURDATE())
-    GROUP BY QUARTER(create_date)
-) w ON q.quarter = w.quarter
+    GROUP BY MONTH(create_date)
+) w ON m.month = w.month
 LEFT JOIN (
     SELECT
-        QUARTER(create_date) AS QUARTER,
+        MONTH(create_date) AS MONTH,
         SUM(electricity_value) AS electricityValue
     FROM energy_electricity
     WHERE YEAR(create_date) = YEAR(CURDATE())
-    GROUP BY QUARTER(create_date)
-) e ON q.quarter = e.quarter
+    GROUP BY MONTH(create_date)
+) e ON m.month = e.month
 LEFT JOIN (
     SELECT
-        QUARTER(call_date) AS QUARTER,
+        MONTH(call_date) AS MONTH,
         SUM(duck_weight) AS feedValue
     FROM env_regular_call_feeding
     WHERE YEAR(call_date) = YEAR(CURDATE())
-    GROUP BY QUARTER(call_date)
-) f ON q.quarter = f.QUARTER
-ORDER BY q.quarter
+    GROUP BY MONTH(call_date)
+) f ON m.month = f.month
+ORDER BY m.month
    </select>
 
     <select id="listScreenFeed" resultType="com.huimv.guowei.admin.entity.vo.ScreenFeedVo">