修改健康报告时间

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/health/HealthReportService.java

@@ -238,7 +238,7 @@ public class HealthReportService {
         //曲线偏差率
         QueryWrapper<Reportdeviation> reportdeviationQueryWrapper = new QueryWrapper<>();
         reportdeviationQueryWrapper.eq("wtid",wt.getId());
-        reportdeviationQueryWrapper.ge("recorddate",monthFirst).le("recorddate",yestday);
+        reportdeviationQueryWrapper.ge("recorddate",monthFirst).le("recorddate",date);
         List<Reportdeviation> wtreportsub = reportdeviationService.list(reportdeviationQueryWrapper);
 //        List<Wtreportsub> wtreportsub = wtreportsubService.qxpcllist(wt.getId(),day);
         if (wtreportsub!=null && wtreportsub.size()>0){
@@ -282,7 +282,7 @@ public class HealthReportService {
         //对风偏差第三段
         QueryWrapper<Windturbinepoweryaw> windturbinepoweryawQueryWrapper = new QueryWrapper<>();
         windturbinepoweryawQueryWrapper.eq("windturbineid",wt.getId());
-        windturbinepoweryawQueryWrapper.ge("recorddate",monthFirst).le("recorddate",yestday);
+        windturbinepoweryawQueryWrapper.ge("recorddate",monthFirst).le("recorddate",date);
         List<Windturbinepoweryaw> windturbinepoweryaws = windturbinepoweryawService.list(windturbinepoweryawQueryWrapper);
         if (windturbinepoweryaws!=null && windturbinepoweryaws.size()>0){
             List<Double> collect = windturbinepoweryaws.stream().map(i -> i.getPower()).distinct().collect(Collectors.toList());
@@ -348,11 +348,15 @@ public class HealthReportService {
         winddeviationrateQueryWrapper.eq("wtid",wt.getId());
         List<Winddeviationrate> winddeviationrates = winddeviationrateService.list(winddeviationrateQueryWrapper);
         if (winddeviationrates!=null){
+            List<NippleVo> nippleVos = new ArrayList<>();
             winddeviationrates.stream().forEach(i->{
                 NippleVo vo = new NippleVo();
                 vo.setPcl(Integer.parseInt(i.getType().substring(i.getType().indexOf("R")+1)));
                 vo.setCount(i.getCount());
+                nippleVos.add(vo);
             });
+            SortUtils.sort(nippleVos,"pcl",SortUtils.ASC);
+                healthReportVo.setNipples(nippleVos);
 
         }
 //        List<Windturbinewindyaw> nzs =windturbinewindyawService.getnzt(wt.getId(),day);

gradeevaluation/src/test/java/com/gyee/gradeevaluation/GradeevaluationApplicationTests.java

@@ -58,7 +58,10 @@ class GradeevaluationApplicationTests {
 
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);
-
+        healthReportService.saveHealthReport(date,date,"MHS_FDC");
+        healthReportService.saveHealthReport(date,date,"NSS_FDC");
+        healthReportService.saveHealthReport(date,date,"SBQ_FDC");
+        healthReportService.saveHealthReport(date,date,"QS_FDC");
         healthReportService.saveHealthReport(date,date,"XS_FDC");
 
        // specificService.saveWindpowerspecificinfoday("2020-05-02","2020-06-01");