【CHG】需求变更

railway-business/src/main/java/com/railway/business/bi/controller/ShowBdycController.java

@@ -67,10 +67,21 @@ public class ShowBdycController extends BaseController {
     return AjaxResult.success(list);
   }
 
-  @ApiOperation(value = "今日遗留列表")
+  @ApiOperation(value = "推送问题今日遗留列表")
   @GetMapping(value = "/remainList")
   public TableDataInfo remainList(BdycQuery showBdyc) {
     startPage();
+    showBdyc.setFoundMode(YcxxFoundModeEnum.PUSH.getCode());
+    showBdyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
+    List<ShowBdyc> list = showBdycService.getList(showBdyc);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "自主发现问题今日遗留列表")
+  @GetMapping(value = "/remainSelfList")
+  public TableDataInfo remainSelfList(BdycQuery showBdyc) {
+    startPage();
+    showBdyc.setFoundMode(YcxxFoundModeEnum.SELF.getCode());
     showBdyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
     List<ShowBdyc> list = showBdycService.getList(showBdyc);
     return getDataTable(list);

railway-business/src/main/java/com/railway/business/bi/controller/ShowDlycController.java

@@ -67,10 +67,21 @@ public class ShowDlycController extends BaseController {
     return AjaxResult.success(list);
   }
 
-  @ApiOperation(value = "今日遗留列表")
+  @ApiOperation(value = "推送问题今日遗留列表")
   @GetMapping(value = "/remainList")
   public TableDataInfo remainList(DlycQuery showDlyc) {
     startPage();
+    showDlyc.setFoundMode(YcxxFoundModeEnum.PUSH.getCode());
+    showDlyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
+    List<ShowDlyc> list = showDlycService.getList(showDlyc);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "自主发现问题今日遗留列表")
+  @GetMapping(value = "/remainSelfList")
+  public TableDataInfo remainSelfList(DlycQuery showDlyc) {
+    startPage();
+    showDlyc.setFoundMode(YcxxFoundModeEnum.SELF.getCode());
     showDlyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
     List<ShowDlyc> list = showDlycService.getList(showDlyc);
     return getDataTable(list);

railway-business/src/main/java/com/railway/business/bi/service/impl/ChartServiceImpl.java

@@ -268,6 +268,13 @@ public class ChartServiceImpl implements IChartService {
   public ChartVO getChartSyjhbydxqk() {
     String[] xAxis = new String[]{"本月"};
 
+    String yearStart = LocalDateUtil.convertLocalDateToString(
+        LocalDateUtil.getFirstDayOfyearLocalDate(), LocalDateUtil.DATE_FORMATTER);
+    String yearEnd = LocalDateUtil.convertLocalDateToString(
+        LocalDateUtil.getLastDayOfYearLocalDate(), LocalDateUtil.DATE_FORMATTER);
+    SingleTotalVO kgYearTotal = kgMapper.getKgTotalByDate(yearStart, yearEnd);
+    SingleTotalVO dtYearTotal = dtMapper.getDtTotalByDate(yearStart, yearEnd);
+
     String monthStart = LocalDateUtil.convertLocalDateToString(
         LocalDateUtil.getFirstDayOfMonthLocalDate(), LocalDateUtil.DATE_FORMATTER);
     String monthEnd = LocalDateUtil.convertLocalDateToString(
@@ -283,8 +290,10 @@ public class ChartServiceImpl implements IChartService {
     SingleTotalVO dtWeekTotal = dtMapper.getDtTotalByDate(weekStart, weekEnd);
 
     List<SeriesDTO> series = new ArrayList<>();
+    series.addAll(getSingleSeries(kgYearTotal, xAxis, "开关分合本年度计划", "开关分合本年度完成"));
     series.addAll(getSingleSeries(kgMonthTotal, xAxis, "开关分合本月计划", "开关分合本月完成"));
     series.addAll(getSingleSeries(kgWeekTotal, xAxis, "开关分合本周计划", "开关分合本周完成"));
+    series.addAll(getSingleSeries(dtYearTotal, xAxis, "单体本年度计划", "单体本年度完成"));
     series.addAll(getSingleSeries(dtMonthTotal, xAxis, "单体本月计划", "单体本月完成"));
     series.addAll(getSingleSeries(dtWeekTotal, xAxis, "单体本周计划", "单体本周完成"));
 

railway-common/src/main/java/com/railway/common/utils/LocalDateUtil.java

@@ -414,6 +414,16 @@ public final class LocalDateUtil {
     return date.with(TemporalAdjusters.firstDayOfMonth());
   }
 
+  /**
+   * 获取给定LocalDateTime类型时间所在月的第一天
+   *
+   * @return LocalDateTime类型时间所在月的第一天
+   */
+  public static LocalDate getFirstDayOfyearLocalDate() {
+    LocalDate date = LocalDate.now();
+    return date.with(TemporalAdjusters.firstDayOfYear());
+  }
+
   /**
    * 获取给定时间戳(毫秒)类型时间所在月的第一天
    *
@@ -458,6 +468,16 @@ public final class LocalDateUtil {
             LocalTime.MIN);
   }
 
+  /**
+   * 获取给定LocalDateTime类型时间所在月的第一天
+   *
+   * @return LocalDateTime类型时间所在月的第一天
+   */
+  public static LocalDate getLastDayOfYearLocalDate() {
+    LocalDate date = LocalDate.now();
+    return date.with(TemporalAdjusters.lastDayOfYear());
+  }
+
   /**
    * 获取给定LocalDateTime类型时间所在月的第一天
    *