From 172a53cca92e7c74228b46f587de572adfd1e1f6 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 22 Jul 2025 14:23:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=97=A8=E6=88=B7):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=9C=A8=E8=81=8C=E4=BA=BA=E6=95=B0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 getOnJobNumber 接口的返回类型从 List<PortalPO>改为 Map<String, Object>
- 新增 total 字段，用于统计在职人数总数
---
 .../portal/controller/LeaderCockpitController.java        | 2 +-
 .../weaver/seconddev/portal/entity/param/BaseParam.java   | 4 ++++
 .../seconddev/portal/service/LeaderCockpitService.java    | 2 +-
 .../portal/service/impl/LeaderCockpitServiceImpl.java     | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java b/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java
index 34dd006..9d7c652 100644
--- a/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java
+++ b/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java
@@ -29,7 +29,7 @@ public class LeaderCockpitController {
     LeaderCockpitService leaderCockpitService;
 
     @PostMapping("/getOnJobNumber")
-    private WeaResult<List<PortalPO>> getOnJobNumber(@RequestBody Map<String, String> params) {
+    private WeaResult<Map<String, Object>> getOnJobNumber(@RequestBody Map<String, String> params) {
         return leaderCockpitService.getOnJobNumber(params);
     }
 
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
index 3f95e65..ca91eab 100644
--- a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java
+++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java
@@ -24,6 +24,10 @@ public class BaseParam {
      * 岗位自定义表
      */
     private String table_job_cus = "ft_1155455711525494797";
+    ///**
+    // * 员工自定义表
+    // */
+    //private String table_emp_cus = "ft_1152026012537184302";
     /**
      * 租户标识
      */
diff --git a/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java b/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java
index f53c836..99556b8 100644
--- a/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java
+++ b/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java
@@ -21,7 +21,7 @@ public interface LeaderCockpitService {
      * @param params
      * @return
      */
-    WeaResult<List<PortalPO>> getOnJobNumber(Map<String, String> params);
+    WeaResult<Map<String, Object>> getOnJobNumber(Map<String, String> params);
 
     /**
      * 获取人工成本
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 588f19d..0502cb9 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
@@ -1,5 +1,6 @@
 package com.weaver.seconddev.portal.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.weaver.common.base.entity.result.WeaResult;
 import com.weaver.common.hrm.dao.HrmCommonEmployeeDao;
@@ -41,12 +42,15 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService {
     DepartMentService departMentService;
 
     @Override
-    public WeaResult<List<PortalPO>> getOnJobNumber(Map<String, String> params) {
+    public WeaResult<Map<String, Object>> getOnJobNumber(Map<String, String> params) {
         SearchConditionParam searchConditionParam = new SearchConditionParam();
         initSearchConditionParam(searchConditionParam, params, null);
         log.error("searchConditionParam===" + JSON.toJSONString(searchConditionParam));
         List<PortalPO> onJobNumber = leaderCockpitMapper.getOnJobNumber(searchConditionParam);
-        return WeaResult.success(onJobNumber);
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("data", onJobNumber);
+        returnMap.put("total", onJobNumber.stream().mapToInt(item -> Convert.toInt(item.getValue(), 0)).sum());
+        return WeaResult.success(returnMap);
     }
 
     @Override