From f8c29798f96b096bc3eec9fee4ad42bf31ccdd02 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 27 May 2024 11:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BA=BA=E5=91=98=E5=8D=A0?=
 =?UTF-8?q?=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/worker/mapper/xml/WorkerInfoMapper.xml   |  5 +++--
 .../worker/service/impl/WorkerInfoServiceImpl.java   | 12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index fce4c01de..eab320b53 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -632,8 +632,9 @@
         ORDER BY personNum DESC
     </select>
     <select id="selectEnterpriseWorkerGroupTotal" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT p.enterprise_name
-        , COUNT(1) num
+        SELECT p.enterprise_name,
+        p.id as enterpriseId,
+        COUNT(1) num
         <if test="enterpriseType == '2'.toString()">
             , IFNULL(sum((CASE WHEN w1.person_type = 1 then 1 ELSE 0 END)), 0) lwPersonTotal
             , IFNULL(sum((CASE WHEN w1.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 93c266274..48f066d4b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -856,7 +856,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         Map<String, Object> data = new HashMap<>();
         map = getCompanyParam(map);
         map.put("enterpriseType", "1");
-        List<Map<String, Object>> enterpriseList = workerInfoMapper.selectEnterpriseWorkerGroupTotal(map);
+        List<Map<String, Object>> enterpriseList = this.selectEnterpriseWorkerGroupTotal(map);
         map.put("enterpriseType", "2");
         List<Map<String, Object>> enterpriseManageList = workerInfoMapper.selectEnterpriseWorkerGroupTotal(map);
         data.put("enterpriseList", enterpriseList);
@@ -864,7 +864,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         return data;
     }
 
-    @Override
+    private List<Map<String, Object>> selectEnterpriseWorkerGroupTotal(Map<String, Object> map) {
+        List<Map<String, Object>> mapList = workerInfoMapper.selectEnterpriseWorkerGroupTotal(map);
+        int total = mapList.stream().mapToInt(m -> MapUtils.getInteger(m, "num")).sum();
+        for (Map<String, Object> m : mapList) {
+            m.put("ratio", NumberUtils.div(MapUtils.getInteger(m, "num") * 100.0, total * 1.0, 2));
+        }
+        return mapList;
+    }
+
     public Map<String, Object> selectWorkerManagePresenceStatistics(Map<String, Object> map) {
         Map<String, Object> data = new HashMap<>();
         map = getCompanyParam(map);