Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

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

@@ -96,7 +96,6 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 reports1.add(report1);
             }
             weekData.put("weekData", reports1);
-            report = new ArrayList<>();
             newData.put("newData", report);
             returnList.add(0, newData);
             returnList.add(1, weekData);
@@ -137,8 +136,8 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
             List<PmWorkContent> pmWorkContents = pmWorkContentMapper.selectList(wrapperC);
             report.get(0).setWorkContents(pmWorkContents);
             newData.put("newData", report);
-            returnList.set(0, newData);
-            returnList.set(1, weekData);
+            returnList.add(0, newData);
+            returnList.add(1, weekData);
             return returnList;
         }
         List<PmWorkReport> reportList = new ArrayList<>();
@@ -180,11 +179,15 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         } else {
             report = report2;
         }
-        Integer rId = report.get(0).getId();
-        LambdaQueryWrapper<PmWorkContent> wrapperC = Wrappers.lambdaQuery();
-        wrapperC.eq(PmWorkContent::getProjectId, rId);
-        List<PmWorkContent> pmWorkContents = pmWorkContentMapper.selectList(wrapperC);
-        report.get(0).setWorkContents(pmWorkContents);
+        Integer pId = report.get(0).getId();
+        List<PmWorkContent> pmWorkContentList = new ArrayList<>();
+        for (PmWorkContent pmWorkContent : contents) {
+            Integer pId2 = pmWorkContent.getReportId();
+            if (pId2 == pId){
+                pmWorkContentList.add(pmWorkContent);
+            }
+        }
+        report.get(0).setWorkContents(pmWorkContentList);
         weekData.put("weekData", reportList);
         newData.put("newData", report);
         returnList.add(0, newData);