修复带入最新一条数据问题

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -164,24 +164,13 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 .orderByDesc(PmWorkReport::getSubmitDate)
                 .last("LIMIT 1");
         List<PmWorkReport> report2 = baseMapper.selectList(wrapper2);
-        LambdaQueryWrapper<PmWorkReport> wrapper3 = Wrappers.lambdaQuery();
-        wrapper2.eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
-                .orderByDesc(PmWorkReport::getUpdateTime)
-                .last("LIMIT 1");
-        List<PmWorkReport> report3 = baseMapper.selectList(wrapper3);
-        LocalDateTime sbTime = report2.get(0).getSubmitDate();
-        LocalDateTime upTime = report3.get(0).getSubmitDate();
-        int comparisonResult = sbTime.compareTo(upTime);
-        if (comparisonResult < 0) {
-            report = report3;
-        } else if (comparisonResult == 0) {
-            report = report2;
-        } else {
-            report = report2;
-        }
+        report = report2;
         Integer pId = report.get(0).getId();
         List<PmWorkContent> pmWorkContentList = new ArrayList<>();
-        for (PmWorkContent pmWorkContent : contents) {
+        LambdaQueryWrapper<PmWorkContent> wrapper= Wrappers.lambdaQuery();
+        wrapper.eq(PmWorkContent::getReportId,pId);
+        List<PmWorkContent> contents1 = pmWorkContentMapper.selectList(wrapper);
+        for (PmWorkContent pmWorkContent : contents1) {
             Integer pId2 = pmWorkContent.getReportId();
             if (pId2 == pId){
                 pmWorkContentList.add(pmWorkContent);