|
@@ -622,5 +622,44 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @description: 查询定时报告
|
|
|
+ * @author: fu
|
|
|
+ * @date: 2024/8/7 20:17
|
|
|
+ * @param: []
|
|
|
+ * @return: java.util.List<com.usky.iot.domain.PmWorkReport>
|
|
|
+ **/
|
|
|
+ @Override
|
|
|
+ public List<PmWorkReport> timedReportQuery() {
|
|
|
+ Long userId = SecurityUtils.getUserId();
|
|
|
+ LambdaQueryWrapper<PmWorkReport> reports = Wrappers.lambdaQuery();
|
|
|
+ reports.eq(PmWorkReport::getSubmitterId, userId)
|
|
|
+ .eq(PmWorkReport::getReportStatus, 0)
|
|
|
+ .orderByAsc(PmWorkReport::getReportDate);
|
|
|
+ List<PmWorkReport> timedReports = pmWorkReportMapper.selectList(reports);
|
|
|
+
|
|
|
+ if (timedReports.isEmpty()){
|
|
|
+ return timedReports;
|
|
|
+ }
|
|
|
+ List<Integer> reportIds = timedReports.stream().map(PmWorkReport::getId).collect(Collectors.toList());
|
|
|
+
|
|
|
+ LambdaQueryWrapper<PmWorkContent> reportContents = Wrappers.lambdaQuery();
|
|
|
+ reportContents.in(PmWorkContent::getReportId, reportIds);
|
|
|
+ List<PmWorkContent> pmWorkContentList = pmWorkContentMapper.selectList(reportContents);
|
|
|
+ for (PmWorkReport report : timedReports) {
|
|
|
+ Integer id = report.getId();
|
|
|
+ List<PmWorkContent> workContents = new ArrayList<>();
|
|
|
+ for (PmWorkContent content : pmWorkContentList) {
|
|
|
+ Integer reportId = content.getReportId();
|
|
|
+ if (reportId.equals(id)) {
|
|
|
+ workContents.add(content);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ report.setWorkContents(workContents);
|
|
|
+ }
|
|
|
+
|
|
|
+ return timedReports;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|