Browse Source

优化接口

huangsanjia 1 year ago
parent
commit
9fcf2c55be
1 changed files with 17 additions and 6 deletions
  1. 17 6
      application/api/controller/Staff.php

+ 17 - 6
application/api/controller/Staff.php

@@ -38,9 +38,6 @@ class Staff extends Api
         }
         $params = Request::instance()->param();
         $where = [];
-        if (!empty($params['department_code'])){
-            $where['部门编码']  = $params['department_code'];
-        }
         $where['在职状态'] = '在职';
         if (isset($params['mes_online'])){
             $where['在职状态'] = $params['mes_online'] > 1 ? '离职':'在职';
@@ -49,7 +46,6 @@ class Staff extends Api
         if (isset($params['u8_online'])){
             $where['U8在职'] = $params['u8_online'] > 1 ? '离职':'在职';
         }
-
         $where['员工编号|员工姓名'] = array('like','%'.$params['search'].'%');
         $limit = $params['limit'];
         if (empty($limit)){
@@ -59,10 +55,16 @@ class Staff extends Api
         if (empty($pages)){
             $pages = 1;
         }
+
         $field = '员工编号,rtrim(员工姓名) as 员工姓名,性别,聘用日期,转正日期,rtrim(所在部门) as 所在部门,rtrim(部门编码) as 部门编码,rtrim(职称职务) as 职称职务,rtrim(身份证号) as 身份证号,出生日期,
         rtrim(人员性质) as 人员性质,rtrim(人员类别) as 人员类别,班次类型,工资表类别,薪酬核算分组,rtrim(在职状态) as 在职状态,rtrim(U8在职) as U8在职,U8离职日期,rtrim(sys_id) as sys_id,sys_rq,mod_rq';
-        $list = Db::name('人事_基本资料')->where($where)->field($field)->page($pages)->limit($limit)->order('UniqID asc')->select();
-        $total = Db::name('人事_基本资料')->where($where)->count();
+        if (strlen($params['department_code']) > 1){
+            $list = Db::name('人事_基本资料')->where($where)->where('部门编码',$params['department_code'])->field($field)->page($pages)->limit($limit)->order('UniqID asc')->select();
+            $total = Db::name('人事_基本资料')->where($where)->where('部门编码',$params['department_code'])->count();
+        }else{
+            $list = Db::name('人事_基本资料')->where($where)->where('LEFT(部门编码,1)='.$params['department_code'])->field($field)->page($pages)->limit($limit)->order('UniqID asc')->select();
+            $total = Db::name('人事_基本资料')->where($where)->where('LEFT(部门编码,1)='.$params['department_code'])->count();
+        }
         $data['list'] = $list;
         $data['total'] = $total;
         $this->success('请求成功',$data);
@@ -95,6 +97,15 @@ class Staff extends Api
                 $list[$key] = $value;
             }
         }
+        $six = Db::name('人事_基本资料')->where('在职状态','在职')->where('U8在职','离职')->count();
+        $sixArr['编号'] = '';
+        $sixArr['名称'] = '离职工资结算中';
+        $sixArr['total'] = $six;
+        $sev = Db::name('人事_基本资料')->where('在职状态','离职')->where('U8在职','离职')->count();
+        $sevArr['编号'] = '';
+        $sevArr['名称'] = '离职清单';
+        $sevArr['total'] = $sev;
+        array_push($data,$sixArr,$sevArr);
         foreach ($data as $k=>$v){
             $i = 0;
             $data[$k]['children'] = [];