1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -7618,31 +7618,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         projectTimeCostList.forEach(pt->{
             List<Map<String, Object>> mapList = taskGroupPlanTimeList.stream().filter(t -> t.get("projectId").equals(pt.get("projectId"))).collect(Collectors.toList());
+            switch (Integer.valueOf(pt.get("status").toString())){
+                case 1:pt.put("status","进行中");
+                    break;
+                case 2:pt.put("status","已完成");
+                    break;
+                case 3:pt.put("status","已撤销");
+                    break;
+                case 4:pt.put("status","暂停");
+                    break;
+            }
             pt.put("projectGroupData",mapList);
         });
-        if(projectMain==null){
-            responseData.put("projectArrays",projectTimeCostList);
-            msg.setData(responseData);
-            return msg;
-        }
-        List<Map<String,Object>> projectMainTimeCostList=reportMapper.getProjectMainTimeCost(thirdPartyInterfaces.get(0).getCompanyId(),projectMain.getCode());
-        projectMainTimeCostList.forEach(pt->{
-            List<Map<String, Object>> mapList = projectTimeCostList.stream().filter(p -> p.get("pmId").equals(pt.get("pmId"))).collect(Collectors.toList());
-            mapList.forEach(m->{
-                switch (Integer.valueOf(m.get("status").toString())){
-                    case 1:m.put("status","进行中");
-                        break;
-                    case 2:m.put("status","已完成");
-                        break;
-                    case 3:m.put("status","已撤销");
-                        break;
-                    case 4:m.put("status","暂停");
-                        break;
-                }
-            });
-            pt.put("projectArrays",mapList);
-        });
-        responseData.put("projectMainData",projectMainTimeCostList);
+        responseData.put("projectArrays",projectTimeCostList);
         msg.setData(responseData);
         return msg;
     }