预估工时导出修改

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

@@ -2890,11 +2890,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         float allday=timeTypeMapper.selectOne(new QueryWrapper<TimeType>()
                 .eq("company_id",companyId)).getAllday();
         //根据公司的id搜索该公司有哪些项目  20231108之前完成的不统计,状态为进行中/已完成
-        List<Project> selectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId).in("status", 1, 2));
-        List<Integer> collectProjectIds = selectList.stream().map(Project::getId).collect(Collectors.toList());
 
-        List<Project> selectProjects = projectMapper.selectList(new QueryWrapper<Project>().in("id", collectProjectIds)
-                .isNull("finish_date").or().ge("finish_date", "2023-11-08").eq(projectId != null, "project_id", projectId));
+        List<Project> selectProjects = projectMapper.selectList(new QueryWrapper<Project>()
+                .eq("company_id", companyId).in("status", 1, 2)
+                .and(wrapper->wrapper.isNull("finish_date").or().ge("finish_date", "2023-11-08")).eq(projectId!=null,"id",projectId));
 
         //查询到的project列表
         List<Integer> collectIds = selectProjects.stream().map(Project::getId).collect(Collectors.toList());