抄表率

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRate7DayMapper.java

@@ -19,13 +19,14 @@ import java.util.List;
 public interface ReadRate7DayMapper {
 
     /**
-    * 统计抄表率
-    * @author Andy
-    * @date 15:01 2021/8/3
-    * @param condition:
-    * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
-    **/
-    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("userCondition") UserCondition condition);
+     * 统计抄表率
+     * @author Andy
+     * @date 15:02 2021/8/3
+     * @param condition:
+     * @param statDay:
+     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
+     **/
+    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("statDay") int statDay,@Param("userCondition") UserCondition condition);
 
     /**
     * 查询数据

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateMonthMapper.java

@@ -19,13 +19,14 @@ import java.util.List;
 public interface ReadRateMonthMapper {
 
     /**
-    * 统计抄表率
-    * @author Andy
-    * @date 15:01 2021/8/3
-    * @param condition:
-    * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
-    **/
-    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("userCondition") UserCondition condition);
+     * 统计抄表率
+     * @author Andy
+     * @date 15:02 2021/8/3
+     * @param condition:
+     * @param statDay:
+     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
+     **/
+    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("statDay") int statDay,@Param("userCondition") UserCondition condition);
 
     /**
     * 查询数据

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateTodayMapper.java

@@ -23,9 +23,10 @@ public interface ReadRateTodayMapper {
     * @author Andy
     * @date 15:02 2021/8/3
     * @param condition:
+    * @param statDay:
     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
     **/
-    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("userCondition") UserCondition condition);
+    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("statDay") int statDay,@Param("userCondition") UserCondition condition);
 
     /**
     *  查询数据

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateYesterdayMapper.java

@@ -19,13 +19,14 @@ import java.util.List;
 public interface ReadRateYesterdayMapper {
 
     /**
-    * 统计抄表率
-    * @author Andy
-    * @date 15:02 2021/8/3
-    * @param condition:
-    * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
-    **/
-    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("userCondition") UserCondition condition);
+     * 统计抄表率
+     * @author Andy
+     * @date 15:02 2021/8/3
+     * @param condition:
+     * @param statDay:
+     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
+     **/
+    List<StatisticsReadRateVo> statReadRateGroupCategory(@Param("statDay") int statDay,@Param("userCondition") UserCondition condition);
 
     /**
     * 查询数据

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRate7Day.xml

@@ -47,6 +47,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <include refid="permissionCondition"></include>
     GROUP BY rd.category_id
   </select>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateMonth.xml

@@ -46,6 +46,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <include refid="permissionCondition"></include>
     GROUP BY rd.category_id
   </select>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateToday.xml

@@ -46,6 +46,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <include refid="permissionCondition"></include>
     GROUP BY rd.category_id
   </select>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateYesterday.xml

@@ -46,6 +46,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <include refid="permissionCondition"></include>
     GROUP BY rd.category_id
   </select>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRate7DayServiceImpl.java

@@ -29,7 +29,7 @@ public class ReadRate7DayServiceImpl extends AbstractReadRateService {
 
     @Override
     public List<StatisticsReadRateVo> statReadRateGroupCategory(UserCondition userCondition) {
-        return readRate7DayMapper.statReadRateGroupCategory(userCondition);
+        return readRate7DayMapper.statReadRateGroupCategory(DateUtil.parseInt(new Date(), -1), userCondition);
     }
 
     @Override

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateMonthServiceImpl.java

@@ -29,7 +29,7 @@ public class ReadRateMonthServiceImpl extends AbstractReadRateService {
 
     @Override
     public List<StatisticsReadRateVo> statReadRateGroupCategory(UserCondition userCondition){
-        return readRateMonthMapper.statReadRateGroupCategory(userCondition);
+        return readRateMonthMapper.statReadRateGroupCategory(queryDate(), userCondition);
     }
 
     @Override

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateTodayServiceImpl.java

@@ -28,7 +28,7 @@ public class ReadRateTodayServiceImpl extends AbstractReadRateService {
 
     @Override
     public List<StatisticsReadRateVo> statReadRateGroupCategory(UserCondition userCondition) {
-        return readRateTodayMapper.statReadRateGroupCategory(userCondition);
+        return readRateTodayMapper.statReadRateGroupCategory(DateUtil.parseInt(new Date(), 0),userCondition);
     }
 
     @Override

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateYesterdayServiceImpl.java

@@ -28,7 +28,7 @@ public class ReadRateYesterdayServiceImpl extends AbstractReadRateService {
 
     @Override
     public List<StatisticsReadRateVo> statReadRateGroupCategory(UserCondition userCondition) {
-        return readRateYesterdayMapper.statReadRateGroupCategory(userCondition);
+        return readRateYesterdayMapper.statReadRateGroupCategory(DateUtil.parseInt(new Date(), -1), userCondition);
     }
 
     @Override