水压

huimv-admin/src/main/resources/mapper/EnergyWaterPressureMapper.xml

@@ -28,9 +28,9 @@
     <select id="listDayWaterPressure" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
         SELECT create_date,
         <foreach collection="chipCodeList" item="code" index="index" separator=",">
-            COALESCE(ROUND(MAX (CASE WHEN chip_code = ${code} THEN water_value END),2),0) AS 'value${index+1}'
+            COALESCE(ROUND(MAX(CASE WHEN chip_code = #{code} THEN water_value END), 2), 0) AS value${index + 1}
         </foreach>
-        FROM `energy_water_pressure`
+        FROM energy_water_pressure
         WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND TO_DAYS(create_date) = TO_DAYS(NOW())
         GROUP BY create_date
     </select>
@@ -48,11 +48,11 @@
     <select id="listWaterLineDayDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
         SELECT create_date,
         <foreach collection="chipCodeList" item="code" index="index" separator=",">
-            IFNULL(ROUND(SUM(CASE WHEN chip_code = ${code} THEN water_value END),2), 0) AS 'value${index+1}'
+            IFNULL(ROUND(AVG(CASE WHEN chip_code = #{code} THEN water_value END), 2), 0) AS value${index + 1}
         </foreach>
         FROM `energy_water_pressure`
-        WHERE chip_code IN ${chipCodes} AND TO_DAYS(create_date) = TO_DAYS(NOW()) AND farm_id = #{farmId}
-        GROUP BY create_date
+        WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(), INTERVAL -DAY(CURDATE()) + 1 DAY)) AND NOW()
+        GROUP BY DATE_FORMAT(create_date, "%Y-%m-%d");
     </select>
 
     <select id="listWaterLineWeekDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">