From 753ca358941f727404af1be4b9b8fda59a8eb0a2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 24 May 2024 16:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B1=A5=E8=81=8C=E7=9A=84?=
 =?UTF-8?q?=E4=BB=8E=E8=81=8C=E5=8A=A1=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/worker/entity/WorkerInfo.java     |  1 -
 .../mapper/xml/WorkerAttendanceMapper.xml     | 37 +++++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
index 5b80a59ba..ffb11455c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
@@ -269,7 +269,6 @@ public class WorkerInfo implements Serializable {
      */
     @Excel(name = "职务类型", width = 15)
     @ApiModelProperty(value = "职务类型")
-    @Deprecated
     private java.lang.String jobType;
     /**
      * 职务
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
index 9e4cfb1e3..5587a66ff 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
@@ -830,14 +830,43 @@
         t.enterprise_name,
         count(*) as inServiceNum,
         ifnull(sum(if(t1.person_sn is null,1,0)),0) as notPerformNum,
-        ifnull(sum(if(wi.job_name=50,1,0)),0) as xmjlInServiceNum,
-        ifnull(sum(if(wi.job_name=50 and t1.person_sn is null,1,0)),0) as xmjlNotPerformNum,
+        ifnull(sum(if(wi.job_name=28 or wi.job_name=29 or wi.job_name=50,1,0)),0) as xmjlInServiceNum,
+        ifnull(sum(if((wi.job_name=28 or wi.job_name=29 or wi.job_name=50) and t1.person_sn is null,1,0)),0) as
+        xmjlNotPerformNum,
         ifnull(sum(if(wi.job_name=44,1,0)),0) as aqyInServiceNum,
         ifnull(sum(if(wi.job_name=44 and t1.person_sn is null,1,0)),0) as aqyNotPerformNum,
         ifnull(sum(if(wi.job_name=46,1,0)),0) as zlyInServiceNum,
         ifnull(sum(if(wi.job_name=46 and t1.person_sn is null,1,0)),0) as zlyNotPerformNum,
-        ifnull(sum(if(wi.job_name=37,1,0)),0) as jlInServiceNum,
-        ifnull(sum(if(wi.job_name=37 and t1.person_sn is null,1,0)),0) as jlNotPerformNum
+        ifnull(sum(if(wi.job_name=37
+        or wi.job_name=52
+        or wi.job_name=53
+        or wi.job_name=54
+        or wi.job_name=55
+        or wi.job_name=56
+        or wi.job_name=57
+        or wi.job_name=58
+        or wi.job_name=59
+        or wi.job_name=60
+        or wi.job_name=61
+        or wi.job_name=62
+        or wi.job_name=63
+        or wi.job_name=64
+        or wi.job_name=65,1,0)),0) as jlInServiceNum,
+        ifnull(sum(if((wi.job_name=37
+        or wi.job_name=52
+        or wi.job_name=53
+        or wi.job_name=54
+        or wi.job_name=55
+        or wi.job_name=56
+        or wi.job_name=57
+        or wi.job_name=58
+        or wi.job_name=59
+        or wi.job_name=60
+        or wi.job_name=61
+        or wi.job_name=62
+        or wi.job_name=63
+        or wi.job_name=64
+        or wi.job_name=65) and t1.person_sn is null,1,0)),0) as jlNotPerformNum
         from enterprise_info t
         join worker_info wi on wi.enterprise_id=t.id
         left join (select person_sn from worker_attendance where project_sn=#{param.projectSn}