后台水表

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyWaterPressureServiceImpl.java

@@ -90,7 +90,7 @@ public class EnergyWaterPressureServiceImpl extends ServiceImpl<EnergyWaterPress
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
         if (StringUtils.isEmpty(unitId)){
-            unitId = "83";
+            unitId = "95";
         }
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate")+" 23:59:59";

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyWaterServiceImpl.java

@@ -92,7 +92,7 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
         if (StringUtils.isEmpty(unitId)) {
-            unitId = "83";
+            unitId = "95";
         }
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate") + " 23:59:59";

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

@@ -33,6 +33,7 @@
         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
+        order by create_date asc
     </select>
 
     <select id="listMonthWaterPressure" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
@@ -52,7 +53,8 @@
         </foreach>
         FROM `energy_water_pressure`
         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");
+        GROUP BY DATE_FORMAT(create_date, "%Y-%m-%d")
+        order by create_date asc
     </select>
 
     <select id="listWaterLineWeekDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
@@ -63,6 +65,7 @@
         FROM `energy_water_pressure`
         WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
         GROUP BY DATE_FORMAT(create_date, "%Y-%m-%d")
+        order by create_date asc
     </select>
 
     <select id="listWaterLineMonthDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
@@ -73,6 +76,7 @@
         FROM `energy_water_pressure`
         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")
+        order by create_date asc
 
     </select>
 
@@ -84,5 +88,6 @@
         FROM `energy_water_pressure`
         WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN '${startDate}' AND '${endDate}'
         GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+        order by create_date asc
     </select>
 </mapper>