Browse Source

周报查询修改

zx 5 months ago
parent
commit
5dec006df7

+ 1 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/ReportController.java

@@ -149,7 +149,7 @@ public class ReportController extends BaseController {
 
         PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
         nextDay.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
-        nextDay.setEndDate(DateUtils.getNextSunday(startDate,DateUtils.YYYYMMDD));
+        nextDay.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
         List<PdmReportPlanNextDay> nextList = pdmReportPlanNextDayService.selectReportPlanNext(nextDay);
 
         PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();

+ 1 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/WeeklyReportController.java

@@ -150,7 +150,7 @@ public class WeeklyReportController extends BaseController {
         String fiveLevelRiskNum="0";
         long liveWorkingNum=0;
         PdmReportPlanNextDay next = new PdmReportPlanNextDay();
-        next.setReportDate(nextMonday);
+        next.setStartDate(nextMonday);
         next.setEndDate(nextSunday);
         List<PdmReportPlanNextDay> nextList = pdmReportPlanNextDayService.selectReportPlanNext(next);
         if(nextList!=null && nextList.size()>1){