From fd8e854656daa31b099f7d42e4792127961d70e2 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 27 Feb 2023 17:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=9F=E8=AE=A1=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/worker/mapper/WorkerInfoMapper.java   |  2 ++
 .../modules/worker/mapper/xml/WorkerInfoMapper.xml     | 10 ++++++++++
 .../worker/service/impl/WorkerInfoServiceImpl.java     |  3 +++
 3 files changed, 15 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
index 4ffa4d476..67c51cfe3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
@@ -216,4 +216,6 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
     List<String> getDeclareAge(@Param("projectSn") String projectSn, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
     PersonnelSituationVO getPersonnelSituation(String projectSn);
+
+    Long selectSceneTotal(String project);
 }
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 1acd854a9..ef48df170 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
@@ -364,6 +364,16 @@
             and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
         </if>
     </select>
+
+    <select id="selectSceneTotal" resultType="java.lang.Long" parameterType="java.lang.String">
+        SELECT COUNT(1) totalPerson
+        from worker_info w1
+        INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn
+        Left JOIN team_info g ON (w1.project_sn = g.project_sn and w1.team_id = g.id)
+        WHERE w1.project_sn = #{projectSn}
+        and w1.inService_type = 1
+    </select>
+
     <select id="selectWorkerTeamTotal" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT team_id teamId,
         COUNT(1) totalPerson
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 e330a62f9..43cff57af 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
@@ -1585,10 +1585,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
 
     @Override
     public PersonnelSituationVO getPersonnelSituation(String projectSn) {
+        // 现场
+        Long scene = workerInfoMapper.selectSceneTotal(projectSn);
         PersonnelSituationVO personnelSituation = workerInfoMapper.getPersonnelSituation(projectSn);
         Long bePresent = personnelSituation.getBePresent();
         // 今日出勤率
         personnelSituation.setAtteRatio(bePresent == null || bePresent == 0L ? 0F : NumberUtil.round(personnelSituation.getTodayAtte() * 100F / bePresent, 2).floatValue());
+        personnelSituation.setScene(scene);
         return personnelSituation;
     }