From 2e48fa6a9bcfd608f068f5845683665e4aa9262e Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Wed, 22 May 2024 01:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B1=A5=E8=81=8C=E5=88=86?=
 =?UTF-8?q?=E6=9E=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/SafetyPerformanceAnalysisVo.java |  3 ++-
 .../mapper/xml/WorkerAttendanceMapper.xml      |  1 +
 .../impl/WorkerAttendanceServiceImpl.java      | 18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java
index 27420ba90..bf5bfe9e0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java
@@ -27,6 +27,7 @@ public class SafetyPerformanceAnalysisVo {
     private Integer jlNotPerformNum;
     @ApiModelProperty("监理在职总数")
     private Integer jlInServiceNum;
-
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String enterpriseName;
     private List<SafetyPerformanceAnalysisVo> list;
 }
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 1e656bf0f..088411c0a 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
@@ -827,6 +827,7 @@
     <select id="safetyPerformanceAnalysis"
             resultType="com.zhgd.xmgl.modules.worker.entity.vo.SafetyPerformanceAnalysisVo">
         select
+        t.enterprise_name,
         count(*) as inServiceNum,
         ifnull(sum(if(t1.person_sn is null,1,0)),0) as notPerformNum,
         ifnull(sum(if(wi.job_type=50,1,0)),0) as xmjlInServiceNum,
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
index 94dafc0f5..6e98df7a9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
@@ -1150,15 +1150,15 @@ status	状态码	String	1表示成功；其余表示失败
             Integer jlNotPerformNum1 = one.getJlNotPerformNum();
             Integer jlInServiceNum1 = one.getJlInServiceNum();
             notPerformNum += notPerformNum1;
-            inServiceNum += notPerformNum1;
-            xmjlNotPerformNum += notPerformNum1;
-            xmjlInServiceNum += notPerformNum1;
-            aqyNotPerformNum += notPerformNum1;
-            aqyInServiceNum += notPerformNum1;
-            zlyNotPerformNum += notPerformNum1;
-            zlyInServiceNum += notPerformNum1;
-            jlNotPerformNum += notPerformNum1;
-            jlInServiceNum += notPerformNum1;
+            inServiceNum += inServiceNum1;
+            xmjlNotPerformNum += xmjlNotPerformNum1;
+            xmjlInServiceNum += xmjlInServiceNum1;
+            aqyNotPerformNum += aqyNotPerformNum1;
+            aqyInServiceNum += aqyInServiceNum1;
+            zlyNotPerformNum += zlyNotPerformNum1;
+            zlyInServiceNum += zlyInServiceNum1;
+            jlNotPerformNum += jlNotPerformNum1;
+            jlInServiceNum += jlInServiceNum1;
         }
         vo.setNotPerformNum(notPerformNum);
         vo.setInServiceNum(inServiceNum);