1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -192,7 +192,7 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     List<String> getUserIds(ArrayList<Integer> deptIds, String startDate, String endDate);
 
-    List<Map<String, Object>> getProjectTimeCost(Integer companyId,@Param("list") List<Integer> projectMainIds);
+    List<Map<String, Object>> getProjectTimeCost(Integer companyId,Integer projectId);
 
     List<Map<String, Object>> getProjectMainTimeCost(Integer companyId,String requestProjectMainCode);
 

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

@@ -7591,17 +7591,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             msg.setError("Request Parameter Parsing Error,Unable to find 'projectMainCode'");
             return msg;
         }
-        String requestProjectMainCode = String.valueOf(requestProjectQuery.get("projectMainCode"));
-        ProjectMain projectMain = projectMainMapper.selectOne(new LambdaQueryWrapper<ProjectMain>().eq(ProjectMain::getCode, requestProjectMainCode));
-        if(projectMain==null){
-            msg.setError("'projectMainCode'["+requestProjectMainCode+"] is Not Exist");
+        String requestProjectCode = String.valueOf(requestProjectQuery.get("projectMainCode"));
+        Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectCode, requestProjectCode).eq(Project::getCompanyId,thirdPartyInterfaces.get(0).getCompanyId()));
+        if(project==null){
+            msg.setError("'projectMainCode'["+requestProjectCode+"] is Not Exist");
             return msg;
         }
         Map<String,Object> responseData=new HashMap<>();
-        List<Map<String,Object>> projectMainTimeCostList=reportMapper.getProjectMainTimeCost(thirdPartyInterfaces.get(0).getCompanyId(),requestProjectMainCode);
-        List<Integer> projectMainIds = projectMainTimeCostList.stream().map(p -> Integer.valueOf(String.valueOf(p.get("pmId")))).distinct().collect(Collectors.toList());
-        projectMainIds.add(-1);
-        List<Map<String,Object>> projectTimeCostList=reportMapper.getProjectTimeCost(thirdPartyInterfaces.get(0).getCompanyId(),projectMainIds);
+        ProjectMain projectMain = projectMainMapper.selectOne(new LambdaQueryWrapper<ProjectMain>().eq(ProjectMain::getId, project.getProjectMainId()));
+//        List<Integer> projectMainIds = projectMainTimeCostList.stream().map(p -> Integer.valueOf(String.valueOf(p.get("pmId")))).distinct().collect(Collectors.toList());
+//        projectMainIds.add(-1);
+        List<Map<String,Object>> projectTimeCostList=reportMapper.getProjectTimeCost(thirdPartyInterfaces.get(0).getCompanyId(),project.getId());
         List<Integer> projectIds = projectTimeCostList.stream().map(p -> Integer.valueOf(String.valueOf(p.get("projectId")))).distinct().collect(Collectors.toList());
         projectIds.add(-1);
         List<Map<String,Object>> taskGroupPlanTimeList=reportMapper.getTaskGroupPlanTime(projectIds);
@@ -7620,6 +7620,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<Map<String, Object>> mapList = taskGroupPlanTimeList.stream().filter(t -> t.get("projectId").equals(pt.get("projectId"))).collect(Collectors.toList());
             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->{

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1040,10 +1040,7 @@
         left join user u on u.id=p.incharger_id
         left join report r on r.project_id=p.id
         where p.company_id=#{companyId}
-        and p.project_main_id in
-        <foreach collection="list" item="item" separator="," close=")" open="(">
-            #{item}
-        </foreach>
+        and p.id=#{projectId}
         group by p.id
     </select>