重写:预估工时表查询

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -14,6 +14,7 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.management.platform.config.PropertyMsg;
+import com.management.platform.entity.vo.GroupEstimatedWorkVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -458,6 +459,15 @@ public class Project extends Model<Project> {
     @TableField("from_outside")
     private Integer fromOutside;
 
+    /**
+     * 预估工时表:任务分组
+     */
+    @TableField(exist = false)
+    private List<GroupEstimatedWorkVO> groupEstimatedWorkVOList;
+
+    //实际工时
+    @TableField(exist = false)
+    private String reallyWorkTime;
 
     @Override
     protected Serializable pkVal() {

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

@@ -184,7 +184,7 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     List<Report> getSumWorkingTime(ArrayList<Integer> deptIds, String startDate, String endDate);
 
-    double getReallWorkingTimeByProjectId(Integer id);
+    Double getReallWorkingTimeByProjectId(Integer id);
 
-    double getReallWorkingTimeByProjectAndGroup(Integer projectId, Integer taskGroupId);
+    Double getReallWorkingTimeByProjectAndGroup(Integer projectId, Integer taskGroupId);
 }

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

@@ -266,56 +266,69 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
-    @Override
     public HttpRespMsg getProjectEstimatedWork(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //通过公司id获取该公司所有的项目列表
         User user = userMapper.selectById(request.getHeader("Token"));
         Integer companyId = user.getCompanyId();
-        //根据公司的id搜索该公司有哪些项目  20231108之前完成的不统计,状态为进行中/已完成
-        LambdaQueryWrapper<Project> lqw = new LambdaQueryWrapper<>();
-        lqw.in(Project::getStatus,1,2).eq(Project::getCompanyId,companyId);
-        List<Project> projectList = projectMapper.selectList(lqw);
         //该公司下的allday
-        float allday=timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id",companyId)).getAllday();
-        ArrayList<ProjectEstimatedWorkVO> projectEstimatedWorkVOS = new ArrayList<>();
-        if (projectList.size()>0){
-            LocalDate date = LocalDate.parse("2023-11-08");
-            //20231108之前完成的不统计,状态为进行中/已完成
-            List<Project> projects = projectList.stream().filter(p -> (p.getFinishDate().isAfter(date)) || (p.getFinishDate() == null)).collect(Collectors.toList());
-
-            for (Project project : projects) {
-                ProjectEstimatedWorkVO projectEstimatedWorkVO = new ProjectEstimatedWorkVO();
-                projectEstimatedWorkVO.setId(project.getId());
-                projectEstimatedWorkVO.setProjectName(project.getProjectName());
-                projectEstimatedWorkVO.setEstimatedWorkTime(String.valueOf(project.getManDay()*allday));
-                double reallyProjectWorkingTime=reportMapper.getReallWorkingTimeByProjectId(project.getId());
-                projectEstimatedWorkVO.setWorkTime(String.valueOf(reallyProjectWorkingTime));
-
-                ArrayList<GroupEstimatedWorkVO> groupEstimatedWorkVOS = new ArrayList<>();
-
-                LambdaQueryWrapper<TaskGroup> tlqw = new LambdaQueryWrapper<>();
-                tlqw.eq(TaskGroup::getProjectId,project.getId());
-                List<TaskGroup> taskGroups = taskGroupMapper.selectList(tlqw);
-                if (taskGroups.size()>0){
-                    for (TaskGroup taskGroup : taskGroups) {
-                        GroupEstimatedWorkVO groupEstimatedWorkVO = new GroupEstimatedWorkVO();
-                        groupEstimatedWorkVO.setEstimatedWorkTime(String.valueOf(taskGroup.getManDay()*allday));
-                        groupEstimatedWorkVO.setId(taskGroup.getId());
-                        groupEstimatedWorkVO.setGroupName(taskGroup.getName());
-                        double reallyGroupWorkingTime=reportMapper.getReallWorkingTimeByProjectAndGroup(project.getId(),taskGroup.getId());
-                        groupEstimatedWorkVO.setEstimatedWorkTime(String.valueOf(reallyGroupWorkingTime));
-
-                        groupEstimatedWorkVOS.add(groupEstimatedWorkVO);
-                    }
-                }
-                projectEstimatedWorkVO.setGroupEstimatedWorkVOList(groupEstimatedWorkVOS);
-                projectEstimatedWorkVOS.add(projectEstimatedWorkVO);
-
-            }
-
-        }
-        httpRespMsg.data=projectEstimatedWorkVOS;
+        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());
+
+        IPage<Project> projectIPage = projectMapper.selectPage(new Page<>(pageIndex, pageSize), new QueryWrapper<Project>().in("id", collectProjectIds)
+                .isNull("finish_date").or().ge("finish_date", "2023-11-08").eq(projectId!=null,"project_id",projectId));
+
+        //查询到的project列表
+        List<Project> records = projectIPage.getRecords();
+        List<Integer> collectIds = records.stream().map(Project::getId).collect(Collectors.toList());
+
+        //根据查询道德project列表查询总的reporeList
+        List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>()
+                .in("project_id", collectIds));
+        //根据查询道德project列表查询总的task_groupList
+        List<TaskGroup> taskGroups = taskGroupMapper.selectList(new QueryWrapper<TaskGroup>()
+                .in("project_id", collectIds));
+
+        for (Project project : records) {
+            Double reallWorkTime = reportList.stream().filter(r -> r.getProjectId() .equals( project.getId()))
+                    .mapToDouble(r->r.getWorkingTime()).sum();
+            String rWorkTime=reallWorkTime==null ? "0":reallWorkTime+"";
+            project.setReallyWorkTime(rWorkTime);
+            String pEstimatedWork=project.getManDay()==null ? 0*allday+"": project.getManDay()*allday+"";
+            project.setEstimatedWorkTime(pEstimatedWork);
+            List<TaskGroup> taskGroupCollect = taskGroups.stream().filter(t -> t.getProjectId() == project.getId())
+                    .collect(Collectors.toList());
+
+            ArrayList<GroupEstimatedWorkVO> groupEstimatedWorkVOS = new ArrayList<>();
+
+            if (taskGroupCollect.size()>0){
+                List<Integer> groupIds = taskGroupCollect.stream().map(TaskGroup::getId).collect(Collectors.toList());
+                List<Report> getByProjectAndGroup = reportMapper.selectList(new QueryWrapper<Report>()
+                        .eq("project_id", project.getId())
+                        .in("group_id", groupIds));
+                for (TaskGroup taskGroup : taskGroupCollect) {
+                    Double gReallWorkTime = getByProjectAndGroup.stream().filter(r -> r.getGroupId().equals( taskGroup.getId()))
+                            .mapToDouble(r->r.getWorkingTime()).sum();
+                    GroupEstimatedWorkVO groupEstimatedWorkVO = new GroupEstimatedWorkVO();
+                    String grWorkTime=gReallWorkTime==null ? "0":gReallWorkTime+"";
+                    String gEstimatedWork=taskGroup.getManDay()==null ? 0*allday+"": taskGroup.getManDay()*allday+"";
+
+                    groupEstimatedWorkVO.setWorkTime(grWorkTime);
+                    groupEstimatedWorkVO.setEstimatedWorkTime(gEstimatedWork);
+                    groupEstimatedWorkVO.setId(taskGroup.getId());
+                    groupEstimatedWorkVO.setGroupName(taskGroup.getName());
+
+                    groupEstimatedWorkVOS.add(groupEstimatedWorkVO);
+                }
+            }
+            project.setGroupEstimatedWorkVOList(groupEstimatedWorkVOS);
+        }
+        projectIPage.setRecords(records);
+
+        httpRespMsg.data=projectIPage;
         return httpRespMsg;
     }
 

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

@@ -984,6 +984,7 @@
     <select id="getReallWorkingTimeByProjectId" resultType="java.lang.Double">
         SELECT SUM(working_time) as reallyWorkingTime FROM report WHERE project_id = #{id}
     </select>
+
     <select id="getReallWorkingTimeByProjectAndGroup" resultType="java.lang.Double">
         SELECT SUM(working_time) as reallyWorkingTime FROM report WHERE project_id = #{projectId} AND group_id = #{taskGroupId}
     </select>