diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 9468c5c9..4c4e66c9 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -143,7 +143,7 @@ public class DepartmentBO { tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString()); tree.setSelected(false); tree.setType("2"); - tree.setParentComp(item.getSubCompanyId1().toString()); + tree.setParentComp(null == item.getSubCompanyId1() ? "" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); return tree; }).collect(Collectors.toList()); diff --git a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java index 363161fc..127bacfd 100644 --- a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java +++ b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java @@ -27,5 +27,30 @@ public interface DanikorResourceMapper { */ List getHrmColumnByTableName(@Param("tableName") String tableName); - Integer summaryData(@Param("tableName") String tableName, @Param("syncDate") String syncDate); + /** + * 汇总人员数 + * + * @param tableName + * @param syncDate + * @return + */ + Integer summaryResourceData(@Param("tableName") String tableName, @Param("syncDate") String syncDate); + + /** + * 汇总分部数 + * + * @param tableName + * @param syncDate + * @return + */ + Integer summaryCompanyData(@Param("tableName") String tableName, @Param("syncDate") String syncDate); + + /** + * 汇总部门数 + * + * @param tableName + * @param syncDate + * @return + */ + Integer summaryDepartmentData(@Param("tableName") String tableName, @Param("syncDate") String syncDate); } diff --git a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml index 0fcd418a..b6a8a440 100644 --- a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml +++ b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml @@ -41,8 +41,32 @@ and status < 4 - isnull(canceled, '0') = '0' + + + + and sync_date = #{syncDate} + + + + +