kangwei ：共享风险库

@@ -63,7 +63,7 @@ public class JTDisplayScreenController {
     }
     }
     @AutoLog(value = "水质水量：右侧图表")
     @AutoLog(value = "水质水量：右侧图表")
     @ApiOperation(value = "水质水量：右侧图表", notes = "水质水量：右侧图表")
     @ApiOperation(value = "水质水量：右侧图表", notes = "水质水量：右侧图表")
-    @GetMapping("/waterQualityCchart")
+    @GetMapping("/waterQualityChart")
     public Result<List<WaterQualityChartVO>> waterQualityCchart(String departId, String time ){
     public Result<List<WaterQualityChartVO>> waterQualityCchart(String departId, String time ){
         Result<List<WaterQualityChartVO>> result = new Result<>();
         Result<List<WaterQualityChartVO>> result = new Result<>();
         List<WaterQualityChartVO>  waterTrendVOList =  displayScreenService.queryWaterQualityChart(departId ,time);
         List<WaterQualityChartVO>  waterTrendVOList =  displayScreenService.queryWaterQualityChart(departId ,time);

@@ -45,7 +45,7 @@ public class JTDisplayScreenServiceImpl implements IJTDisplayScreenService {
 
 
         String lastDay = com.skua.core.util.DateUtils.getLastDay();//昨天
         String lastDay = com.skua.core.util.DateUtils.getLastDay();//昨天
         String currentDate = DateUtil.getCurrentDate();//今天
         String currentDate = DateUtil.getCurrentDate();//今天
-        DateVO dateVO = new DateVO( DateUtil.getCurrentDate() );
+        DateVO dateVO = new DateVO( DateUtils.format(new Date(),"yyyy-MM") );
         //时间差
         //时间差
         int differenceTime = DateUtil.differenceTime( dateVO.getNowYearStartDate(),currentDate);
         int differenceTime = DateUtil.differenceTime( dateVO.getNowYearStartDate(),currentDate);
         //主库数据源
         //主库数据源