diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java new file mode 100644 index 0000000..943720c --- /dev/null +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java @@ -0,0 +1,19 @@ +package com.weaver.seconddev.portal.entity.param; + +import lombok.Data; + +/** + * @author:dxfeng + * @createTime: 2025/07/11 + * @version: 1.0 + */ +@Data +public class BaseParam { + private String e10_common = "e10_common"; + private String e10_core_business = "e10_core_business"; + private String e10_other_business = "e10_other_business"; + private String ec_secondev = "ec_secondev"; + private String eteams = "eteams"; + + private String table_dept_cus = "ft_1154218872715993098"; +} diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/BasicPersonnelParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/BasicPersonnelParam.java index 8ebc9c2..059ab6f 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/BasicPersonnelParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BasicPersonnelParam.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.portal.entity.param; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Set; @@ -10,7 +11,8 @@ import java.util.Set; * @version: 1.0 */ @Data -public class BasicPersonnelParam { +@EqualsAndHashCode(callSuper = false) +public class BasicPersonnelParam extends BaseParam{ private Set departmentIdList; private String searchType; private String startDate; diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java index 49c62f1..85fc9f4 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.portal.entity.param; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Set; @@ -10,7 +11,8 @@ import java.util.Set; * @version: 1.0 */ @Data -public class HrbpParam { +@EqualsAndHashCode(callSuper = false) +public class HrbpParam extends BaseParam{ private String tenantKey; private Set departmentIdList; } diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/SearchConditionParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/SearchConditionParam.java index 8a246bc..cbe636d 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/SearchConditionParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/SearchConditionParam.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.portal.entity.param; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Set; @@ -10,7 +11,8 @@ import java.util.Set; * @version: 1.0 */ @Data -public class SearchConditionParam { +@EqualsAndHashCode(callSuper = false) +public class SearchConditionParam extends BaseParam{ private String tenantKey; private String departmentId; private Set departmentIdList; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java index b52f979..c606633 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java @@ -37,79 +37,79 @@ public interface LeaderCockpitMapper { /** * 查询入职人数 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - int getEmploymentCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + int getEmploymentCount(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); /** * 查询入职人数列表 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - List getEmploymentListByPosition(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + List getEmploymentListByPosition(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); /** * 查询关键入职人数 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - int getKeyEmploymentCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + int getKeyEmploymentCount(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); /** * 查询离职人数 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - int getResignCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + int getResignCount(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); /** * 查询关键离职人数 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - int getKeyResignCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + int getKeyResignCount(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); /** * 查询离职人数列表 * - * @param tenantKey + * @param param * @param departmentIdList * @param startDate * @param endDate * @return */ - List getResignListByPosition(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); + List getResignListByPosition(@Param("param") SearchConditionParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startDate") String startDate, @Param("endDate") String endDate); - Position getPositionById(@Param("tenantKey") String tenantKey, @Param("positionId") String positionId); + Position getPositionById(@Param("param") SearchConditionParam param, @Param("positionId") String positionId); /** * 获取顶级部门id列表 * - * @param tenantKey + * @param param * @return */ - Set getTopDepartmentIds(@Param("tenantKey") String tenantKey); + Set getTopDepartmentIds(@Param("param") SearchConditionParam param); } diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java index b50250f..bd99e56 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java @@ -59,11 +59,11 @@ public interface ManagerPortalMapper { /** * 获取所负责的顶级部门 * - * @param tenantKey + * @param param * @param emdId * @return */ - List getManageDeptIds(@Param("tenantKey") String tenantKey, @Param("empId") Long emdId); + List getManageDeptIds(@Param("param") BasicPersonnelParam param, @Param("empId") Long emdId); /** * 获取生日人数 @@ -101,24 +101,24 @@ public interface ManagerPortalMapper { /** * 获取年龄统计数据 * - * @param tenantKey + * @param param * @param departmentIdList * @param startIndex * @param endIndex * @return */ - Integer getAgeCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startIndex") Integer startIndex, @Param("endIndex") Integer endIndex); + Integer getAgeCount(@Param("param") BasicPersonnelParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startIndex") Integer startIndex, @Param("endIndex") Integer endIndex); /** * 获取司龄统计数据 * - * @param tenantKey + * @param param * @param departmentIdList * @param startIndex * @param endIndex * @return */ - Integer getComapnyCount(@Param("tenantKey") String tenantKey, @Param("departmentIdList") Collection departmentIdList, @Param("startIndex") Integer startIndex, @Param("endIndex") Integer endIndex); + Integer getComapnyCount(@Param("param") BasicPersonnelParam param, @Param("departmentIdList") Collection departmentIdList, @Param("startIndex") Integer startIndex, @Param("endIndex") Integer endIndex); /** * 饼状图配置信息 diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java index 025a75d..588f19d 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java @@ -62,9 +62,9 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { // 查询范围内在职人员 int onJobCount = leaderCockpitMapper.getOnJobCount(searchConditionParam); // 查询范围内离职人员 - int resignCount = leaderCockpitMapper.getResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int resignCount = leaderCockpitMapper.getResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); // 查询关键离职率 - int keyResignCount = leaderCockpitMapper.getKeyResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int keyResignCount = leaderCockpitMapper.getKeyResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); // 计算离职率 double turnoverRate = calculateRate(keyResignCount, onJobCount); //TODO 计算关键离职率 @@ -101,15 +101,15 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { String month = DateUtil.formatToYearMonth_ZH(localDate); Map allDataMap = new LinkedHashMap<>(3); Map keyDataMap = new LinkedHashMap<>(3); - allDataMap.put(month, leaderCockpitMapper.getEmploymentCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); - keyDataMap.put(month, leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); + allDataMap.put(month, leaderCockpitMapper.getEmploymentCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); + keyDataMap.put(month, leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); String firstDayOfMonthStr = DateUtil.getFirstDayOfPreviousMonthStr(searchConditionParam.getStartDate()); String lastDayOfMonthStr = DateUtil.getLastDayOfPreviousMonthStr(searchConditionParam.getEndDate()); // 前面5个月 for (int i = 1; i < 7; i++) { - allDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getEmploymentCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); - keyDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); + allDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getEmploymentCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); + keyDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); firstDayOfMonthStr = DateUtil.getFirstDayOfPreviousMonthStr(searchConditionParam.getStartDate(), i); lastDayOfMonthStr = DateUtil.getLastDayOfPreviousMonthStr(searchConditionParam.getEndDate(), i); } @@ -121,7 +121,7 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { log.error("selectDepartmentId===" + JSON.toJSONString(selectDepartmentId)); if (CollectionUtils.isEmpty(selectDepartmentId)) { // 未选择部门,查询所有一级部门数据 - selectDepartmentId = leaderCockpitMapper.getTopDepartmentIds(searchConditionParam.getTenantKey()); + selectDepartmentId = leaderCockpitMapper.getTopDepartmentIds(searchConditionParam); log.error("topDepartmentId===" + JSON.toJSONString(selectDepartmentId)); } @@ -135,9 +135,9 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { portalData.setDate(currentMonth); portalData.setDepart(departMentById.getDepartMentName()); // 关键 - int keyEmploymentCount = leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam.getTenantKey(), beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int keyEmploymentCount = leaderCockpitMapper.getKeyEmploymentCount(searchConditionParam, beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); // 非关键 - int employmentCount = leaderCockpitMapper.getEmploymentCount(searchConditionParam.getTenantKey(), beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int employmentCount = leaderCockpitMapper.getEmploymentCount(searchConditionParam, beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); portalData.setKey(keyEmploymentCount); portalData.setAll(employmentCount); portalList.add(portalData); @@ -168,15 +168,15 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { String month = DateUtil.formatToYearMonth_ZH(localDate); Map allDataMap = new LinkedHashMap<>(3); Map keyDataMap = new LinkedHashMap<>(3); - allDataMap.put(month, leaderCockpitMapper.getResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); - keyDataMap.put(month, leaderCockpitMapper.getKeyResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); + allDataMap.put(month, leaderCockpitMapper.getResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); + keyDataMap.put(month, leaderCockpitMapper.getKeyResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), searchConditionParam.getStartDate(), searchConditionParam.getEndDate())); String firstDayOfMonthStr = DateUtil.getFirstDayOfPreviousMonthStr(searchConditionParam.getStartDate()); String lastDayOfMonthStr = DateUtil.getLastDayOfPreviousMonthStr(searchConditionParam.getEndDate()); // 前两个月 for (int i = 1; i < 7; i++) { - allDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); - keyDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getKeyResignCount(searchConditionParam.getTenantKey(), searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); + allDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); + keyDataMap.put(DateUtil.formatToYearMonth_ZH(firstDayOfMonthStr), leaderCockpitMapper.getKeyResignCount(searchConditionParam, searchConditionParam.getDepartmentIdList(), firstDayOfMonthStr, lastDayOfMonthStr)); firstDayOfMonthStr = DateUtil.getFirstDayOfPreviousMonthStr(searchConditionParam.getStartDate(), i); lastDayOfMonthStr = DateUtil.getLastDayOfPreviousMonthStr(searchConditionParam.getEndDate(), i); @@ -188,7 +188,7 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { log.error("selectDepartmentId===" + JSON.toJSONString(selectDepartmentId)); if (CollectionUtils.isEmpty(selectDepartmentId)) { // 未选择部门,查询所有一级部门数据 - selectDepartmentId = leaderCockpitMapper.getTopDepartmentIds(searchConditionParam.getTenantKey()); + selectDepartmentId = leaderCockpitMapper.getTopDepartmentIds(searchConditionParam); log.error("topDepartmentId===" + JSON.toJSONString(selectDepartmentId)); } // 查询每个部门 时间范围内的离职人数 @@ -201,9 +201,9 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { portalData.setDate(currentMonth); portalData.setDepart(departMentById.getDepartMentName()); // 关键 - int keyEmploymentCount = leaderCockpitMapper.getKeyResignCount(searchConditionParam.getTenantKey(), beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int keyEmploymentCount = leaderCockpitMapper.getKeyResignCount(searchConditionParam, beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); // 非关键 - int employmentCount = leaderCockpitMapper.getResignCount(searchConditionParam.getTenantKey(), beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); + int employmentCount = leaderCockpitMapper.getResignCount(searchConditionParam, beLongDeps, searchConditionParam.getStartDate(), searchConditionParam.getEndDate()); portalData.setKey(keyEmploymentCount); portalData.setAll(employmentCount); portalList.add(portalData); diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java index b9441b2..1d091ce 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java @@ -56,7 +56,9 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { @Override public WeaResult> getMangerInfo(Map params) { User currentUser = UserContext.getCurrentUser(); - Set allDepartmentIds = getAllDepartmentIdList(currentUser); + BasicPersonnelParam basicPersonnelParam = new BasicPersonnelParam(); + basicPersonnelParam.setTenantKey(currentUser.getTenantKey()); + Set allDepartmentIds = getAllDepartmentIdList(basicPersonnelParam, currentUser.getEmployeeId()); List departmentList = hrmComInfoCacheHandler.getCacheList(HrmDepartmentComInfo.class, allDepartmentIds); // 获取顶级部门 List topDepartmentList = departmentList.stream() @@ -84,9 +86,10 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { String searchDate = params.get("searchDate"); User currentUser = UserContext.getCurrentUser(); - Set allDepartmentIdList = getAllDepartmentIdList(currentUser); BasicPersonnelParam basicPersonnelParam = new BasicPersonnelParam(); basicPersonnelParam.setTenantKey(currentUser.getTenantKey()); + Set allDepartmentIdList = getAllDepartmentIdList(basicPersonnelParam, currentUser.getEmployeeId()); + // 设置部门范围ID集合 basicPersonnelParam.setDepartmentIdList(allDepartmentIdList); @@ -146,9 +149,10 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { @Override public WeaResult> getTeamMemorialDay(Map params) { User currentUser = UserContext.getCurrentUser(); - Set allDepartmentIdList = getAllDepartmentIdList(currentUser); BasicPersonnelParam basicPersonnelParam = new BasicPersonnelParam(); basicPersonnelParam.setTenantKey(currentUser.getTenantKey()); + Set allDepartmentIdList = getAllDepartmentIdList(basicPersonnelParam, currentUser.getEmployeeId()); + // 设置部门范围ID集合 basicPersonnelParam.setDepartmentIdList(allDepartmentIdList); int birthdayNum = managerPortalMapper.getBirthdayNum(basicPersonnelParam); @@ -186,9 +190,9 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { type = "education"; } User currentUser = UserContext.getCurrentUser(); - Set allDepartmentIdList = getAllDepartmentIdList(currentUser); BasicPersonnelParam basicPersonnelParam = new BasicPersonnelParam(); basicPersonnelParam.setTenantKey(currentUser.getTenantKey()); + Set allDepartmentIdList = getAllDepartmentIdList(basicPersonnelParam, currentUser.getEmployeeId()); // 设置部门范围ID集合 basicPersonnelParam.setDepartmentIdList(allDepartmentIdList); basicPersonnelParam.setPieType(type); @@ -269,7 +273,7 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { PortalPO portalPO = new PortalPO(); portalPO.setName(pieChartConfig.getName()); // 查询时间段内的数据 - Integer ageCount = managerPortalMapper.getAgeCount(basicPersonnelParam.getTenantKey(), basicPersonnelParam.getDepartmentIdList(), pieChartConfig.getStartIndex(), pieChartConfig.getEndIndex()); + Integer ageCount = managerPortalMapper.getAgeCount(basicPersonnelParam, basicPersonnelParam.getDepartmentIdList(), pieChartConfig.getStartIndex(), pieChartConfig.getEndIndex()); portalPO.setValue(String.valueOf(ageCount)); returnList.add(portalPO); } @@ -288,7 +292,7 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { PortalPO portalPO = new PortalPO(); portalPO.setName(pieChartConfig.getName()); // 查询时间段内的数据 - Integer ageCount = managerPortalMapper.getComapnyCount(basicPersonnelParam.getTenantKey(), basicPersonnelParam.getDepartmentIdList(), pieChartConfig.getStartIndex(), pieChartConfig.getEndIndex()); + Integer ageCount = managerPortalMapper.getComapnyCount(basicPersonnelParam, basicPersonnelParam.getDepartmentIdList(), pieChartConfig.getStartIndex(), pieChartConfig.getEndIndex()); portalPO.setValue(String.valueOf(ageCount)); returnList.add(portalPO); } @@ -300,9 +304,9 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { * * @return */ - private Set getAllDepartmentIdList(User currentUser) { + private Set getAllDepartmentIdList(BasicPersonnelParam basicPersonnelParam, Long employeeId) { // 查询所负责的部门 - List manageDeptIds = managerPortalMapper.getManageDeptIds(currentUser.getTenantKey(), currentUser.getEmployeeId()); + List manageDeptIds = managerPortalMapper.getManageDeptIds(basicPersonnelParam, employeeId); // 查询所有的部门、子部门信息 Set allDepartmentList = new HashSet<>(); for (Long manageDeptId : manageDeptIds) { diff --git a/src/main/resources/mapper/HrbpPortalMapper.xml b/src/main/resources/mapper/HrbpPortalMapper.xml index b0c50c4..9228821 100644 --- a/src/main/resources/mapper/HrbpPortalMapper.xml +++ b/src/main/resources/mapper/HrbpPortalMapper.xml @@ -3,7 +3,7 @@ diff --git a/src/main/resources/mapper/LeaderCockpitMapper.xml b/src/main/resources/mapper/LeaderCockpitMapper.xml index 8363b52..f19bc0f 100644 --- a/src/main/resources/mapper/LeaderCockpitMapper.xml +++ b/src/main/resources/mapper/LeaderCockpitMapper.xml @@ -4,8 +4,8 @@ diff --git a/src/main/resources/mapper/ManagerPortalMapper.xml b/src/main/resources/mapper/ManagerPortalMapper.xml index 0fda5ce..817c286 100644 --- a/src/main/resources/mapper/ManagerPortalMapper.xml +++ b/src/main/resources/mapper/ManagerPortalMapper.xml @@ -4,7 +4,7 @@ - select count(id) as value from e10_common.uf_jcl_rzgl t + select count(id) as value from ${e10_common}.uf_jcl_rzgl t where t.delete_type = 0 and t.tenant_key = #{tenantKey} and t.rzzt = 1 @@ -73,20 +73,20 @@ select count(t.id) as value , t.education as id - from e10_common.uf_jcl_employee_information t + from ${e10_common}.uf_jcl_employee_information t where t.delete_type = 0 and t.tenant_key = #{tenantKey} AND t.department IN @@ -171,14 +171,14 @@