预估工时导出修改1

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

@@ -307,10 +307,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<TaskGroup> taskGroups = taskGroupMapper.selectList(new QueryWrapper<TaskGroup>()
                 .in("project_id", collectIds));
 
+        DecimalFormat df = new DecimalFormat("0.00");
+
         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+"";
+            String rWorkTime=reallWorkTime==null ? "0":df.format(reallWorkTime);
             project.setReallyWorkTime(rWorkTime);
             String pEstimatedWork=project.getManDay()==null ? 0*allday+"": project.getManDay()*allday+"";
             project.setEstimatedWorkTime(pEstimatedWork);
@@ -2905,10 +2907,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<TaskGroup> taskGroups = taskGroupMapper.selectList(new QueryWrapper<TaskGroup>()
                 .in("project_id", collectIds));
 
+        DecimalFormat df = new DecimalFormat("0.00");
+
         for (Project project : selectProjects) {
             Double reallWorkTime = reportList.stream().filter(r -> r.getProjectId() .equals( project.getId()))
                     .mapToDouble(r->r.getWorkingTime()).sum();
-            String rWorkTime=reallWorkTime==null ? "0":reallWorkTime+"";
+            String rWorkTime=reallWorkTime==null ? "0":df.format(reallWorkTime);
             project.setReallyWorkTime(rWorkTime);
             String pEstimatedWork=project.getManDay()==null ? 0*allday+"": project.getManDay()*allday+"";
             project.setEstimatedWorkTime(pEstimatedWork);
@@ -2946,12 +2950,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         List<List<String>> exportList = new ArrayList<>();
         //String[] titles = {"项目编号", "项目名称", "任务名称", "计划工时(h)", "实际工时(h)"};
-        String[] titles = {MessageUtils.message("entry.projectId"), MessageUtils.message("entry.projectName"), MessageUtils.message("entry.taskName"), MessageUtils.message("excel.plannedWork"), MessageUtils.message("excel.actualWork")};
+        String[] titles = { MessageUtils.message("entry.projectName"), MessageUtils.message("entry.taskName"), MessageUtils.message("excel.plannedWork"), MessageUtils.message("excel.actualWork")};
         exportList.add(Lists.list(titles));
         for (Project project : selectProjects) {
             List<String> data = new ArrayList<>();
 
-            data.add(project.getProjectCode() == null?"":project.getProjectCode().toString());
             data.add(project.getProjectName() == null?"":project.getProjectName());
             data.add(project.getGroupName() == null?"":project.getGroupName());
             data.add(project.getEstimatedWorkTime() != null?project.getEstimatedWorkTime().toString():"");
@@ -2962,7 +2965,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 List<GroupEstimatedWorkVO> groupEstimatedWorkVOList = project.getGroupEstimatedWorkVOList();
                 for (GroupEstimatedWorkVO groupEstimatedWorkVO : groupEstimatedWorkVOList) {
                     List<String> data1 = new ArrayList<>();
-                    data1.add(groupEstimatedWorkVO.getProjectCode() == null?"":groupEstimatedWorkVO.getProjectCode().toString());
                     data1.add(groupEstimatedWorkVO.getProjectName() == null?"":groupEstimatedWorkVO.getProjectName());
                     data1.add(groupEstimatedWorkVO.getGroupName() == null?"":groupEstimatedWorkVO.getGroupName());
                     data1.add(groupEstimatedWorkVO.getEstimatedWorkTime() != null?groupEstimatedWorkVO.getEstimatedWorkTime().toString():"");