diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 957a0852..e427604f 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -135,6 +135,18 @@ public class ChartServiceImpl extends Service implements ChartService { topChartPO.setExpand("1"); topChartPO.setFisvitual(rs.getString("isvitual")); topChartPO.setHasChildren(getHasChildren(topChartPO.getFtype(), topChartPO.getFobjid()).toString()); + + //二开顶部节点为集团时单独统计在职数和编制数 + if ("0".equals(root)) { + rs.executeQuery("select count(1) as sum from hrmresource where status < 4"); + rs.next(); + topChartPO.setOnJobNum(Util.getIntValue(rs.getString("sum"),0)); + + rs.executeQuery("select sum(staff_num) as staff_sum from jcl_org_onjob where type = 2"); + rs.next(); + topChartPO.setStaffNum(Util.getIntValue(rs.getString("staff_sum"),0)); + } + filterAndAddData(dataList, topChartPO, hideDepartment); //dataList.add(topChartPO); } @@ -154,6 +166,7 @@ public class ChartServiceImpl extends Service implements ChartService { } + @Override public Map asyncCompanyData(Map params) {