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 6a9d9e5..4f13ae7 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 @@ -12,6 +12,10 @@ import java.util.Set; */ @Data @EqualsAndHashCode(callSuper = false) -public class HrbpParam extends BaseParam{ +public class HrbpParam extends com.weaver.seconddev.portal.entity.param.BaseParam { private Set departmentIdList; + private Set departmentIdList; + private Long matrixId; + private Long matrixValueConfigId; + private Long userId; } diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java index 1e3f2ef..c9ba2bb 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java @@ -123,4 +123,11 @@ public interface HrbpPortalMapper { */ int getLeaveCount(HrbpParam param); + /** + * hrbp可查看的应出勤人数 + * @param param + * @return + */ + int getKqRequireByBp(HrbpParam param); + } diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java index 0c71b0e..e8f04ea 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java @@ -114,7 +114,17 @@ public class HrbpPortalServiceImpl implements HrbpPortalService { @Override public WeaResult> getTodayOverview(Map params) { - // TODO - return null; + Map resultMap = new HashMap<>(); + + //部门矩阵中,hrbp负责的部门 + //应出勤人数,部门在职人数 + HrbpParam hrbpParam = new HrbpParam(); + hrbpParam.setTenantKey(UserContext.getCurrentUser().getTenantKey()); + hrbpParam.setMatrixId(Long.valueOf(matrixId)); + hrbpParam.setMatrixValueConfigId(Long.valueOf(matrixValueConfigId)); + hrbpParam.setUserId(UserContext.getCurrentUser().getUserId()); + int totalRequire = hrbpPortalMapper.getKqRequireByBp(hrbpParam); + resultMap.put("totalRequire", totalRequire); + return WeaResult.success(resultMap); } } diff --git a/src/main/resources/mapper/portal/HrbpPortalMapper.xml b/src/main/resources/mapper/portal/HrbpPortalMapper.xml index 05454bd..4616d6b 100644 --- a/src/main/resources/mapper/portal/HrbpPortalMapper.xml +++ b/src/main/resources/mapper/portal/HrbpPortalMapper.xml @@ -175,4 +175,21 @@ and t.personnel_status = 5 +