From d3a6d26f9ccb8e1618c6fe41b3aa3ff3b3ad5da8 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 11 Sep 2024 18:06:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=87=BA=E5=8B=A4?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E7=BB=9F=E8=AE=A1=E7=AE=A1=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worker/entity/vo/PersonTypeAndEduStatisticsVo.java     | 2 +-
 .../xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
index eca2ffbf5..43bca8c47 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
@@ -48,7 +48,7 @@ public class PersonTypeAndEduStatisticsVo {
         private String totalPerson;
         @ApiModelProperty(value = "考勤日环比%")
         private Double totalPersonRhbRatio;
-
+        private Integer lwExitPersonTotal;
     }
 
     @Data
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 95aafcd34..e3e70b44b 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
@@ -1040,7 +1040,8 @@
         IFNULL(sum((CASE WHEN tp.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal,
         IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal
         from
-        (SELECT DISTINCT w1.*
+        (SELECT w1.*,
+        ifnull(sum(if(p.pass_type=2,1,0)),0) as exitNum
         from worker_info w1
         INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
         <where>
@@ -1070,13 +1071,15 @@
                 and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
             </if>
         </where>
+        group by w1.id
         ) tp
     </select>
     <select id="selectYesterdayAttendanceWorkerPersonTypeTotal" resultType="java.util.Map">
         select COUNT(1) totalPerson,
         IFNULL(sum((CASE WHEN tp.person_type = 1 then 1 ELSE 0 END)), 0) lwPersonTotal,
         IFNULL(sum((CASE WHEN tp.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal,
-        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal
+        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal,
+        IFNULL(sum(if(tp.person_type = 1 and exitNum>0,1,0)), 0) lwExitPersonTotal
         from
         (SELECT DISTINCT w1.*
         from worker_info w1

From 86c9698e85938d6d0380e877bada0bc7fcd3681e Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 11 Sep 2024 18:53:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=87=BA=E5=8B=A4?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E7=BB=9F=E8=AE=A1=E7=AE=A1=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml  | 3 ++-
 .../xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
index 82d5ff328..b5fcd5b96 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
@@ -85,7 +85,8 @@
         ex.contract_period_end_time ,ex.contract_period_start_time), 4 )),
         0
         ) * 100,
-        2) period_ratio
+        2) period_ratio,
+        ex.owner_unit
         FROM project a
         INNER JOIN company b ON a.company_sn = b.company_sn
         LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid
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 e3e70b44b..ed1fff39f 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
@@ -1038,7 +1038,8 @@
         select COUNT(1) totalPerson,
         IFNULL(sum((CASE WHEN tp.person_type = 1 then 1 ELSE 0 END)), 0) lwPersonTotal,
         IFNULL(sum((CASE WHEN tp.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal,
-        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal
+        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal,
+        IFNULL(sum(if(tp.person_type = 1 and exitNum>0,1,0)), 0) lwExitPersonTotal
         from
         (SELECT w1.*,
         ifnull(sum(if(p.pass_type=2,1,0)),0) as exitNum
@@ -1078,8 +1079,7 @@
         select COUNT(1) totalPerson,
         IFNULL(sum((CASE WHEN tp.person_type = 1 then 1 ELSE 0 END)), 0) lwPersonTotal,
         IFNULL(sum((CASE WHEN tp.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal,
-        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal,
-        IFNULL(sum(if(tp.person_type = 1 and exitNum>0,1,0)), 0) lwExitPersonTotal
+        IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal
         from
         (SELECT DISTINCT w1.*
         from worker_info w1