设备隐患巡检没数

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/biz/InspectOrderBiz.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -79,8 +80,10 @@ public class InspectOrderBiz {
         Date date = DateUtil.truncate(lastEarlyReport.getReportDate());
         QueryWrapper<EarlyReport> wrapper = new QueryWrapper<EarlyReport>().ge("REPORTDATE", date);
         List<EarlyReport> earlyReportList = earlyReportService.list(wrapper);
+        Map<String, EarlyReport> collect1 = earlyReportList.stream().collect(Collectors.toMap(EarlyReport::getId, Function.identity()));
         List<String> collect = earlyReportList.stream().map(s -> s.getId()).collect(Collectors.toList());
         List<EarlyReportWindturbine> reportWindturbineList = earlyReportWindturbineService.getReportWindturbineByReportId(collect);
+        reportWindturbineList.forEach(erw->erw.setEarlyReport(collect1.get(erw.getReportId())));
         //筛选出 不是对比数据，且不是全场平局，且没有审核过的数据
         reportWindturbineList = reportWindturbineList.stream().filter(s -> s.isVerified() == false && s.isCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
 
@@ -343,7 +346,10 @@ public class InspectOrderBiz {
         List<EarlyReportWindturbine> noVerifiedPort = getNoVerifiedPort(stationId, "");
         for (EarlyReportWindturbine windturbine :
                 noVerifiedPort) {
-            String relatedParts = windturbine.getEarlyReport().getRelatedParts();
+            EarlyReport earlyReport = windturbine.getEarlyReport();
+            String relatedParts = "";
+            if(earlyReport!=null)
+            relatedParts = earlyReport.getRelatedParts();
             if (!map.containsKey(relatedParts)) {
                 map.put(relatedParts, new ArrayList<>());
             }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/EarlyReportWindturbineService.java

@@ -1,5 +1,7 @@
 package com.gyee.wisdom.alarm.sharding.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyReport;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyReportWindturbine;
@@ -39,7 +41,10 @@ public class EarlyReportWindturbineService extends ServiceImpl<EarlyReportWindtu
      **/
 
     public List<EarlyReportWindturbine> getReportWindturbineByReportId(List<String> reportIdList) {
-        List<EarlyReportWindturbine> byReportIds = this.baseMapper.findByReportIds(reportIdList);
+        //List<EarlyReportWindturbine> byReportIds = this.baseMapper.findByReportIds(reportIdList);
+        LambdaQueryWrapper<EarlyReportWindturbine> query = Wrappers.lambdaQuery();
+        query.in(EarlyReportWindturbine::getReportId,reportIdList);
+        List<EarlyReportWindturbine> byReportIds = baseMapper.selectList(query);
         return byReportIds;
 
     }