From a9622a16934395b8795f529d1aa0889fd5c57c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= <lidong@21tb.com>
Date: Mon, 18 Aug 2025 15:36:28 +0800
Subject: [PATCH] =?UTF-8?q?Lee-=E8=8C=B6=E7=99=BE=E9=81=93=E9=97=A8?=
 =?UTF-8?q?=E6=88=B7=E9=9C=80=E6=B1=82=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/entity/param/HrbpParam.java        |  3 +++
 .../service/impl/HrbpPortalServiceImpl.java   | 14 ++++++++++++--
 .../mapper/portal/HrbpPortalMapper.xml        | 19 ++++++++++---------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java b/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java
index 6a9d9e5..30d5d07 100644
--- a/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java
+++ b/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java
@@ -14,4 +14,7 @@ import java.util.Set;
 @EqualsAndHashCode(callSuper = false)
 public class HrbpParam extends BaseParam{
     private Set<Long> departmentIdList;
+    private Long matrixId;
+    private Long matrixValueConfigId;
+    private Long userId;
 }
diff --git a/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java b/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
index 0c71b0e..e8f04ea 100644
--- a/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
+++ b/secondev-chabaidao-portal/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
@@ -114,7 +114,17 @@ public class HrbpPortalServiceImpl implements HrbpPortalService {
 
     @Override
     public WeaResult<Map<String, Object>> getTodayOverview(Map<String, String> params) {
-        // TODO
-        return null;
+        Map<String, Object> 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/secondev-chabaidao-portal/src/main/resources/mapper/portal/HrbpPortalMapper.xml b/secondev-chabaidao-portal/src/main/resources/mapper/portal/HrbpPortalMapper.xml
index b51810f..4616d6b 100644
--- a/secondev-chabaidao-portal/src/main/resources/mapper/portal/HrbpPortalMapper.xml
+++ b/secondev-chabaidao-portal/src/main/resources/mapper/portal/HrbpPortalMapper.xml
@@ -177,18 +177,19 @@
 
     <select id="getKqRequireByBp" resultType="java.lang.Integer">
         SELECT
-        b.id
+        COUNT(DISTINCT b.ID )
         FROM
-        {eteams}.hrm_matrix_value_data a
-        LEFT JOIN
-        {e10_common}.uf_kqtotal b ON b.bm = a.matrix_data_id
+        ${eteams}.hrm_matrix_value_data a
+        LEFT JOIN ${eteams}.employee b ON b.DEPARTMENT = a.matrix_data_id
         WHERE
-        a.tenant_key = #{tenantKey}
-        <!-- 矩阵id -->
-        AND a.matrix_id = #{matrixId}
+        <!-- 部门矩阵id -->
+        a.matrix_id = #{matrixId}
         <!-- 矩阵配置id(hrbp字段id) hrbpId -->
-        AND a.matrix_value_config_id = #{matrixValueConfigId}
+        AND a.matrix_value_config_id =  #{matrixValueConfigId}
+        <!-- 当前人员id -->
+        AND a.relate_id=#{userId}
         AND a.delete_type = 0
+        AND b.accounttype = 0
+        AND b.STATUS = 'normal'
     </select>
-
 </mapper>