diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 1caf2b35..00526fe3 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -752,7 +752,7 @@ public class ChartServiceImpl extends Service implements ChartService { DepartmentComInfo dept = new DepartmentComInfo(); ArrayList list = new ArrayList<>(); list.add(stp.getDataId()); - + BaseBean bb = new BaseBean(); if (ModuleTypeEnum.departmentfielddefined.getValue().equals(stp.getType())) { dept.getAllChildDeptByDepId(list,String.valueOf(stp.getDataId())); @@ -764,10 +764,15 @@ public class ChartServiceImpl extends Service implements ChartService { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); String currentYearMonth = currentDateTime.format(formatter); - rs.executeQuery("select bzrs from uf_bzgljmb where bm = ? and ny = ?",stp.getDataId(),currentYearMonth); - if (rs.next()) { - stp.setStaffNum(Util.getIntValue(rs.getString("bzrs"),0)); + // 部门编制人数向下汇总 + List bzList = new ArrayList<>(); + rs.executeQuery("select bzrs from uf_bzgljmb where bm in ("+value+") and ny = ?",currentYearMonth); + while (rs.next()) { + bzList.add(Util.getIntValue(rs.getString("bzrs"), 0)); } + int sum = bzList.stream().mapToInt(Integer::intValue).sum(); + stp.setStaffNum(sum); + } return stp;