能耗

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

@@ -68,7 +68,8 @@
     </select>
 
     <select id="listSevenDayElectricity" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
-        SELECT IFNUll(ROUND(SUM(electricity_value),2),0) 'electricityValue', create_date FROM `energy_electricity`
+        SELECT IFNULL(ROUND(SUM(electricity_value), 2), 0) AS electricityValue, create_date
+        FROM energy_electricity
         WHERE farm_id = #{farmId} and unit_id = #{unitId}
         AND create_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
         GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")

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

@@ -105,7 +105,7 @@
     <select id="listSixMonthWaterLine" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
         SELECT create_date,
         <foreach collection="chipCodeList" item="code" index="index" separator=",">
-            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+            IFNULL(ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2), 0) AS 'value${index+1}'
         </foreach>
     FROM `energy_water`
     WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
@@ -115,7 +115,7 @@
     <select id="listSevenDayWaterLine" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
         SELECT create_date,
         <foreach collection="chipCodeList" item="code" index="index" separator=",">
-            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+            IFNULL(ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2), 0) AS 'value${index+1}'
         </foreach>
     FROM `energy_water`
     WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)