1

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

@@ -4631,6 +4631,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             pageStart = (pageIndex -1) * pageSize;
         }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
         HashMap map=new HashMap();
         List<Map<String, Object>> dpetStatisticsProgressList;
         Integer total;
@@ -4648,6 +4649,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 BigDecimal divide = nowWorkTime.divide(planWorkTime, 4, RoundingMode.HALF_UP);
                 pt.put("progress",format.format(divide.doubleValue()));
             }
+            Integer departmentId = Integer.valueOf(String.valueOf(pt.get("departmentId")));
+            String departmentName = convertDepartmentIdToCascade(departmentId, departmentList);
+            pt.put("departmentName",departmentName);
         });
         map.put("records",dpetStatisticsProgressList);
         map.put("total",total);

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

@@ -371,7 +371,7 @@
     </select>
 
     <select id="getDpetStatisticsProgressList" resultType="java.util.Map">
-        select de.department_name as departmentName,
+        select de.department_id as departmentId, de.department_name as departmentName,
         SUM(d.work_time) as planWorkTime,
         SUM((select SUM(working_time) from report where user_procedure_team_id = d.id)) as nowWorkTime,
         SUM((select SUM(cost) from report where user_procedure_team_id = d.id)) as  nowCost