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 @@ # 姓名 + 用户状态 工号 用户类型 部门 @@ -22,6 +23,7 @@ +