From 3c2d7115cde67335da056a3a18b51d93edb19fcd Mon Sep 17 00:00:00 2001
From: LHD_HY <2872546851@qq.com>
Date: Tue, 3 Jun 2025 11:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=9C=BA=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonComprehensiveServiceImp.java        |  2 +-
 .../person/PersonComprehensiveMapper.xml      | 19 +++++++++++++------
 .../AttendanceMachine/personEntryList.html    | 16 ++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java
index 99a3c37..754a48b 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java
@@ -681,7 +681,7 @@ public class PersonComprehensiveServiceImp implements PersonComprehensiveService
         collect.forEach((k, v) -> integerList.add(v));
 
         int rowNum = list.size();
-        String fileName = " 出场人员 ";
+        String fileName = "人员入场信息";
         //记录用于合并的rowIndex
         ArrayList<HashMap<String, Integer>> mergeRows = new ArrayList<>();
         int startRowIndex = 3, start = 0;
diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
index 4252357..b78cc7e 100644
--- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
@@ -905,7 +905,7 @@
     <select id="getBasePersonLists" resultType="com.bonus.bmw.person.entity.PersonComprehensiveBean">
         select
             bw.name as name,bw.id_number as idNumber,bw.phone as phone,
-            td.value as postName,bp.name as proName,
+            td.value as postName,bp.name as proName,bw.is_furlough_person as isFurloughPerson,
             CASE
                 bw.employment_type
                 WHEN '0' THEN
@@ -925,12 +925,19 @@
                     '绿灯'
                 END lightStatus,
             CASE
-                bw.ein_status
-                WHEN '0' THEN
+                WHEN bw.ein_status = '-1' AND bw.is_furlough_person = '0' THEN
+                    '未出场'
+                WHEN bw.ein_status = '-1' AND bw.is_furlough_person = '1' THEN
+                    '临时离场'
+                WHEN bw.ein_status = '1' THEN
+                    '出场审核通过'
+                WHEN bw.ein_status = '0' THEN
+                    '出场未审核'
+                WHEN bw.ein_status = '2' THEN
+                    '出场审核不通过'
+                ELSE
                     '未入场'
-                WHEN '1' THEN
-                    '已入场'
-                END exitStatus,
+                END AS exitStatus,
             bw.checkup_date as checkupDate,
             checkup.PHOTO_PATH as checkupFilePath,
             CASE
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.html
index f5400b1..47272fe 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.html
@@ -68,17 +68,17 @@
                                         <button id="importBt" class="layui-btn layui-btn-sm"
                                                 onclick="importData()">导入</button>
                                     </div>
-                                    <a class="layui-btn layui-btn-sm"
-                                       href="../../../../downloads/人员库_导入模板.xlsx" download="人员库_导入模板.xlsx" style="margin-top:0.5%">
-                                        <i class="layui-icon">&#xe601;</i> 模板下载
-                                    </a>
+<!--                                    <a class="layui-btn layui-btn-sm"-->
+<!--                                       href="../../../../downloads/人员库_导入模板.xlsx" download="人员库_导入模板.xlsx" style="margin-top:0.5%">-->
+<!--                                        <i class="layui-icon">&#xe601;</i> 模板下载-->
+<!--                                    </a>-->
 
-                                    <button class="layui-btn layui-btn-sm"
-                                            onclick="checkup()" style="margin-top:0.5%">批量导出体检报告
-                                    </button>
+<!--                                    <button class="layui-btn layui-btn-sm"-->
+<!--                                            onclick="checkup()" style="margin-top:0.5%">批量导出体检报告-->
+<!--                                    </button>-->
                                     <a class="layui-btn layui-btn-sm"
                                        href="../../../../downloads/农民工实名制导入模版.xlsx" download="农民工实名制导入模板.xlsx" style="margin-top:0.5%">
-                                        <i class="layui-icon">&#xe601;</i> 农民工实名制模板下载
+                                        <i class="layui-icon">&#xe601;</i> 模板下载
                                     </a>
                                     <button id="exportBt" onclick="exportPersonnelOnSite()" class="layui-btn layui-btn-sm" style="margin-top:0.5%"><i class="layui-icon">&#xe681;</i>导出</button>
                                 </div>