From 385a1f76ecfbbf977bb29435ce46131a463caaac Mon Sep 17 00:00:00 2001
From: fengjh5 <fengjh5@chinatelecom.cn>
Date: Tue, 2 Jul 2024 17:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=AF=8F=E6=9C=88=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/controllers/Statistics.php        | 17 ++++++++++++++++-
 .../statistics/userAccountStatiistics/list.php  |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/backstage/application/backstage/controllers/Statistics.php b/backstage/application/backstage/controllers/Statistics.php
index a5f9815..35ce2f6 100644
--- a/backstage/application/backstage/controllers/Statistics.php
+++ b/backstage/application/backstage/controllers/Statistics.php
@@ -2104,6 +2104,13 @@ class Statistics extends CI_Controller
 
         $sql = "SELECT
 					a.username,
+					case a.enabled
+                    when 1 then '正常'
+                    when 0 then '停用'
+                    when -1 then '锁定'
+                    when -98 then '过期冻结'
+                    when -99 then '删除'
+                    end as enabled,
 					a.deptname,
 					a.oaid,
 					b.name typename,
@@ -2169,6 +2176,13 @@ class Statistics extends CI_Controller
 
         $sql = "SELECT
 					a.username,
+					case a.enabled
+                    when 1 then '正常'
+                    when 0 then '停用'
+                    when -1 then '锁定'
+                    when -98 then '过期冻结'
+                    when -99 then '删除'
+                    end as enabled,
 					a.cellphone,
 					a.deptname,
 					a.oaid,
@@ -2200,6 +2214,7 @@ class Statistics extends CI_Controller
         foreach ($rows as $row) {
             $item = array();
             array_push($item, $row['username']);
+            array_push($item, $row['enabled']);
             array_push($item, $row['oaid']);
             array_push($item, $row['cellphone']);
             array_push($item, $row['typename']);
@@ -2213,7 +2228,7 @@ class Statistics extends CI_Controller
             array_push($item, $row['record_datetime']);
             array_push($list, $item);
         }
-        $title = array('姓名','工号', '手机号码', '用户类型', '用户部门', '统计日期', '账户类型', '供应商', '订餐消费', '付款码消费', 'IC卡消费', '统计日期');
+        $title = array('姓名','员工状态','工号', '手机号码', '用户类型', '用户部门', '统计日期', '账户类型', '供应商', '订餐消费', '付款码消费', 'IC卡消费', '统计日期');
 
         $data = array();
         $data[] = array('sheet' => '清单', 'titles' => $title, 'list' => $list);
diff --git a/backstage/application/backstage/views/statistics/userAccountStatiistics/list.php b/backstage/application/backstage/views/statistics/userAccountStatiistics/list.php
index 9b19e75..15656d3 100644
--- a/backstage/application/backstage/views/statistics/userAccountStatiistics/list.php
+++ b/backstage/application/backstage/views/statistics/userAccountStatiistics/list.php
@@ -5,6 +5,7 @@
             <tr>
                 <th>#</th>
                 <th>姓名</th>
+                <th>用户状态</th>
                 <th>工号</th>
                 <th>用户类型</th>
                 <th>部门</th>
@@ -22,6 +23,7 @@
                 <tr>
                     <td><?=$i?></td>
                     <td><?=$data['username']?></td>
+                    <td><?=$data['enabled']?></td>
                     <td><?=$data['oaid']?></td>
                     <td><?=$data['typename']?></td>
                     <td><?=$data['deptname']?></td>