接口优化, 工单抽检记录维护接口编写

application/api/controller/OtherCountDocument.php

@@ -32,21 +32,26 @@ class OtherCountDocument extends Api
             $this->error('请求方式错误');
         }
         $rows = db()->table('db_拉料计件')
-            ->field('LEFT(Sczl_rq, 7) as date, sum(Sczl_cl) as counts')
+            ->field('LEFT(Sczl_rq, 7) as date, CAST(sum(Sczl_cl) AS SIGNED) as counts')
             ->group('date')
             ->order('UniqId desc')
             ->limit(13)
             ->select();
-
+        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
         foreach($rows as $key=>$value){
-            $arr = db()->table('db_拉料计件')->alias('l')
-                ->field('rtrim(l.Sczl_bh1) as Sczl_bh1, rtrim(r.员工姓名) as name, sum(l.Sczl_cl) as count')
-                ->where('l.sczl_rq','LIKE',$value['date'].'%')
-                ->join(['人事_基本资料'=>'r'],'l.Sczl_bh1 = r.员工编号')
+            $arr = db()->table('db_拉料计件')
+                ->field('rtrim(Sczl_bh1) as Sczl_bh1, CAST(sum(Sczl_cl) AS SIGNED) as count')
+                ->where('sczl_rq','LIKE',$value['date'].'%')
                 ->group('Sczl_bh1')
                 ->select();
+
+            foreach ($arr as $k=>$v) {
+                $arr[$k]['name'] = array_key_exists($v['Sczl_bh1'],$rs) ? trim($rs[$v['Sczl_bh1']]) : '';
+            }
+
             $rows[$key]['sys'] = [];
             array_push($rows[$key]['sys'],$arr);
+            $rows[$key]['date'] = str_replace('-', '', $rows[$key]['date']);
         }
         $this->success('成功',$rows);
     }
@@ -72,23 +77,27 @@ class OtherCountDocument extends Api
 
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
-            $where['b.Sczl_rq'] = ['LIKE',$req['date'].'%'];
+            $where['Sczl_rq'] = ['LIKE',$req['date'].'%'];
         }else{
             $this->error('参数错误');
         }
-        if (isset($req['Sczl_bh1']) && !empty($req['Sczl_bh1'])) $where['b.Sczl_bh1'] = $req['Sczl_bh1'];
+        if (isset($req['Sczl_bh1']) && !empty($req['Sczl_bh1'])) $where['Sczl_bh1'] = $req['Sczl_bh1'];
 
-        $rows = db()->table('db_拉料计件')->alias('b')
-            ->field('rtrim(b.sczl_Type) as sczl_Type, b.Sczl_rq, b.Sczl_bh1, rtrim(r.员工姓名) as name, b.sczl_gdbh, rtrim(g.Gd_cpmc) as Gd_cpmc, b.Sczl_cl,
-            rtrim(b.Sczl_desc) as Sczl_desc, rtrim(b.Sczl_gxmc) as Sczl_gxmc, b.sczl_yjno, b.sczl_gxh, rtrim(b.sys_id) as sys_id, b.sys_rq, b.mod_rq, b.UniqId')
+        $rows = db()->table('db_拉料计件')
+            ->field('rtrim(sczl_Type) as sczl_Type, LEFT(Sczl_rq, 10) as Sczl_rq, Sczl_bh1, sczl_gdbh, CAST(Sczl_cl AS SIGNED) as Sczl_cl,
+            rtrim(Sczl_desc) as Sczl_desc, rtrim(Sczl_gxmc) as Sczl_gxmc, sczl_yjno, sczl_gxh, rtrim(sys_id) as sys_id, sys_rq, mod_rq, UniqId')
             ->where($where)
-            ->join(['人事_基本资料'=>'r'],'b.Sczl_bh1 = r.员工编号')
-            ->join(['工单_基本资料'=>'g'],'b.sczl_gdbh = g.Gd_gdbh')
-            ->page($page,$limit)
-            ->group('b.sys_rq')
-            ->order('b.Sczl_rq asc, b.UniqId asc')
+            ->order('Sczl_rq asc, UniqId asc')
             ->select();
 
+        $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
+        foreach ($rows as $key=>$value) {
+            $rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
+            $rows[$key]['Gd_cpmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? trim($gd[$value['sczl_gdbh']]) : '';
+            $rows[$key]['name'] = array_key_exists($value['Sczl_bh1'],$rs) ? trim($rs[$value['Sczl_bh1']]) : '';
+        }
+
         $data = [
             'rows'          => $rows,
         ];

application/api/controller/PackagingCountDocument.php

@@ -53,6 +53,7 @@ class PackagingCountDocument extends Api
                     unset($arr[$k]);
                 }
             }
+            $rows[$key]['date'] = str_replace('-', '.', $rows[$key]['date']);
         }
         $this->success('成功',$rows);
     }
@@ -78,22 +79,26 @@ class PackagingCountDocument extends Api
 
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
-            $where['b.sys_rq'] = ['LIKE',$req['date'].'%'];
+            $where['sys_rq'] = ['LIKE',$req['date'].'%'];
         }else{
             $this->error('参数错误');
         }
-        if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['b.sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
-
-        $rows = db()->table('db_包装计件')->alias('b')
-            ->field('b.sczl_bh, rtrim(r.员工姓名) as name, b.sczl_rq, b.sczl_bzdh, 
-            b.sczl_cl1 + b.sczl_cl2 + b.sczl_cl3 + b.sczl_cl4 + b.sczl_cl5 + b.sczl_cl6 as sczl_cl, 
-            b.sczl_返工产量1 + b.sczl_返工产量2 + b.sczl_返工产量3 + b.sczl_返工产量4 + b.sczl_返工产量5 + b.sczl_返工产量6 as sczl_fgsl, 
-            b.sczl_cl1 + b.sczl_cl2 + b.sczl_cl3 + b.sczl_cl4 + b.sczl_cl5 + b.sczl_cl6 + b.sczl_返工产量1 + b.sczl_返工产量2 + b.sczl_返工产量3 + b.sczl_返工产量4 + b.sczl_返工产量5 + b.sczl_返工产量6 as sczl_jjcl, 
-            b.sczl_gdbh1, rtrim(b.sys_id) as sys_id, b.sys_rq, b.mod_rq, b.UniqId')
+        if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
+
+        $rows = db()->table('db_包装计件')
+            ->field('sczl_bh, LEFT(sczl_rq, 10) as sczl_rq, sczl_bzdh, 
+            CAST(sczl_cl1 + sczl_cl2 + sczl_cl3 + sczl_cl4 + sczl_cl5 + sczl_cl6 AS SIGNED) as sczl_cl, 
+            CAST(sczl_返工产量1 + sczl_返工产量2 + sczl_返工产量3 + sczl_返工产量4 + sczl_返工产量5 + sczl_返工产量6 AS SIGNED) as sczl_fgsl, 
+            CAST(sczl_cl1 + sczl_cl2 + sczl_cl3 + sczl_cl4 + sczl_cl5 + sczl_cl6 + sczl_返工产量1 + sczl_返工产量2 + sczl_返工产量3 + sczl_返工产量4 + sczl_返工产量5 + sczl_返工产量6 AS SIGNED) as sczl_jjcl, 
+            sczl_gdbh1, rtrim(sys_id) as sys_id, sys_rq, mod_rq, UniqId')
             ->where($where)
-            ->join(['人事_基本资料'=>'r'],'b.sczl_bh = r.员工编号')
             ->page($page,$limit)
             ->select();
+        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
+        foreach ($rows as $key=>$value) {
+            $rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
+            $rows[$key]['name'] = array_key_exists($value['sczl_bh'],$rs) ? trim($rs[$value['sczl_bh']]) : '';
+        }
 
         $data = [
             'rows'          => $rows,

application/api/controller/PackagingProcessOutput.php

@@ -53,6 +53,7 @@ class PackagingProcessOutput extends Api
                     unset($arr[$k]);
                 }
             }
+            $rows[$key]['date'] = str_replace('-', '.', $rows[$key]['date']);
         }
 
         $this->success('成功',$rows);
@@ -86,17 +87,18 @@ class PackagingProcessOutput extends Api
         if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
 
         $rows = db()->table('db_包装产量预报')
-            ->field('rtrim(sys_id) as sys_id, sczl_rq, 
-            sczl_cl1 + sczl_cl2 + sczl_cl3 + sczl_cl4 + sczl_cl5 + sczl_cl6 as sczl_cl, 
-            (sczl_cl1 * sczl_PgCl1 + sczl_clAdd1) + (sczl_cl2 * sczl_PgCl2 + sczl_clAdd2) + (sczl_cl3 * sczl_PgCl3 + sczl_clAdd3) + (sczl_cl4 * sczl_PgCl4 + sczl_clAdd4) + (sczl_cl5 * sczl_PgCl5 + sczl_clAdd5) + (sczl_cl6 * sczl_PgCl6 + sczl_clAdd6) as sczl_PgCl, 
+            ->field('rtrim(sys_id) as sys_id, LEFT(sczl_rq, 10) as sczl_rq, 
+            CAST(sczl_cl1 + sczl_cl2 + sczl_cl3 + sczl_cl4 + sczl_cl5 + sczl_cl6 AS SIGNED) as sczl_cl, 
+            CAST((sczl_cl1 * sczl_PgCl1 + sczl_clAdd1) + (sczl_cl2 * sczl_PgCl2 + sczl_clAdd2) + (sczl_cl3 * sczl_PgCl3 + sczl_clAdd3) + (sczl_cl4 * sczl_PgCl4 + sczl_clAdd4) + (sczl_cl5 * sczl_PgCl5 + sczl_clAdd5) + (sczl_cl6 * sczl_PgCl6 + sczl_clAdd6) AS SIGNED) as sczl_PgCl, 
             sys_rq, mod_rq, UniqId')
             ->where($where)
             ->page($page,$limit)
             ->select();
         $sczl_cls = $sczl_PgCls = 0;
-        foreach ($rows as $row){
-            $sczl_cls += $row['sczl_cl'];
-            $sczl_PgCls += $row['sczl_PgCl'];
+        foreach ($rows as $key=>$value){
+            $sczl_cls += $value['sczl_cl'];
+            $sczl_PgCls += $value['sczl_PgCl'];
+            $rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
         }
         $data = [
             'sczl_cls'      => $sczl_cls,

application/api/controller/PieceWorkSchedule.php

@@ -37,7 +37,9 @@ class PieceWorkSchedule extends Api
             ->order('UniqId desc')
             ->limit(15)
             ->select();
-
+        foreach($rows as $key=>$value){
+            $rows[$key]['date'] = str_replace('-', '', $rows[$key]['date']);
+        }
         $this->success('成功',$rows);
     }
 
@@ -62,59 +64,50 @@ class PieceWorkSchedule extends Api
 
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
-            $where['b.wgjs_rq'] = ['LIKE',$req['date'].'%'];
+            $where['wgjs_rq'] = ['LIKE',$req['date'].'%'];
         }else{
             $this->error('参数错误');
         }
 
-        $rows = db()->table('db_wgjs')->alias('b')
-            ->field('b.wgjs_rq, b.wgjs_bh1, rtrim(r.员工姓名) as name1, rtrim(r.所在部门) as department, 
-            b.wgjs_js1, rtrim(b.wgjs_yy1) as wgjs_yy1, 
-            b.wgjs_bh2, b.wgjs_js2, rtrim(b.wgjs_yy2) as wgjs_yy2, 
-            b.wgjs_bh3, b.wgjs_js3, rtrim(b.wgjs_yy3) as wgjs_yy3, 
-            b.wgjs_bh4, b.wgjs_js4, rtrim(b.wgjs_yy4) as wgjs_yy4, 
-            b.wgjs_bh5, b.wgjs_js5, rtrim(b.wgjs_yy5) as wgjs_yy5, 
-            b.wgjs_bh6, b.wgjs_js6, rtrim(b.wgjs_yy6) as wgjs_yy6')
+        $rows = db()->table('db_wgjs')
+            ->field('LEFT(wgjs_rq, 10) as wgjs_rq, 
+            wgjs_bh1, CAST(wgjs_js1 AS SIGNED) as wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1, 
+            wgjs_bh2, CAST(wgjs_js2 AS SIGNED) as wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2, 
+            wgjs_bh3, CAST(wgjs_js3 AS SIGNED) as wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3, 
+            wgjs_bh4, CAST(wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4, 
+            wgjs_bh5, CAST(wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5, 
+            wgjs_bh6, CAST(wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6')
             ->where($where)
-            ->join(['人事_基本资料'=>'r'],'b.wgjs_bh1 = r.员工编号')
-            ->order('b.wgjs_rq desc, b.UniqId asc')
+            ->order('wgjs_rq desc, UniqId asc')
             ->page($page,$limit)
             ->select();
 
-        foreach ($rows as $key=>$row){
-            if ($row['wgjs_bh2']){
-                if ($row['wgjs_bh2']==$row['wgjs_bh1']){
-                    $rows[$key]['name2'] = $row['name1'];
-                }else{
-                    $rows[$key]['name2'] = trim(db()->table('人事_基本资料')->field('员工姓名')->where('员工编号',$row['wgjs_bh2'])->find()['员工姓名']);
-                }
-            }
-            if ($row['wgjs_bh3']){
-                if ($row['wgjs_bh3']==$row['wgjs_bh1']){
-                    $rows[$key]['name3'] = $row['name1'];
-                }else{
-                    $rows[$key]['name3'] = trim(db()->table('人事_基本资料')->field('员工姓名')->where('员工编号',$row['wgjs_bh3'])->find()['员工姓名']);
+        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名, 所在部门');
+
+        foreach ($rows as $key=>$value){
+            $rows[$key]['wgjs_js1'] = $value['wgjs_js1'] == 0 ? '' : $value['wgjs_js1'];
+            //存在该员工编号
+            if (array_key_exists($value['wgjs_bh1'],$rs)){
+                $rows[$key]['department'] = trim($rs[$value['wgjs_bh1']]['所在部门']);
+                $rows[$key]['name1'] = trim($rs[$value['wgjs_bh1']]['员工姓名']);
+                for ($i=2;$i<=6;$i++){
+                    $rows[$key]['wgjs_js'.$i] = $value['wgjs_js'.$i] == '0.0' ? '' : $value['wgjs_js'.$i];
+                    if ($value['wgjs_bh'.$i]){
+                        if ($value['wgjs_bh'.$i]==$value['wgjs_bh1']){
+                            $rows[$key]['name'.$i] = $rows[$key]['name1'];
+                        }else{
+                            $rows[$key]['name'.$i] = trim($rs[$value['wgjs_bh'.$i]]['员工姓名']);
+                        }
+                    }
                 }
-            }
-            if ($row['wgjs_bh4']){
-                if ($row['wgjs_bh4']==$row['wgjs_bh1']){
-                    $rows[$key]['name4'] = $row['name1'];
-                }else{
-                    $rows[$key]['name4'] = trim(db()->table('人事_基本资料')->field('员工姓名')->where('员工编号',$row['wgjs_bh4'])->find()['员工姓名']);
-                }
-            }
-            if ($row['wgjs_bh5']){
-                if ($row['wgjs_bh5']==$row['wgjs_bh1']){
-                    $rows[$key]['name5'] = $row['name1'];
-                }else{
-                    $rows[$key]['name5'] = trim(db()->table('人事_基本资料')->field('员工姓名')->where('员工编号',$row['wgjs_bh5'])->find()['员工姓名']);
-                }
-            }
-            if ($row['wgjs_bh6']){
-                if ($row['wgjs_bh6']==$row['wgjs_bh1']){
-                    $rows[$key]['name6'] = $row['name1'];
-                }else{
-                    $rows[$key]['name6'] = trim(db()->table('人事_基本资料')->field('员工姓名')->where('员工编号',$row['wgjs_bh6'])->find()['员工姓名']);
+            }else{
+                $rows[$key]['department'] = '';
+                $rows[$key]['name1'] = '';
+                for ($i=2;$i<=6;$i++){
+                    $rows[$key]['wgjs_js'.$i] = $value['wgjs_js'.$i] == '0.0' ? '' : $value['wgjs_js'.$i];
+                    if ($value['wgjs_bh'.$i]){
+                        $rows[$key]['name'.$i] = '';
+                    }
                 }
             }
         }

application/api/controller/WorkOrderSpotCheck.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+
+/**
+ * 工单抽检记录维护接口
+ */
+class WorkOrderSpotCheck extends Api
+{
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    /**
+     * 首页
+     *
+     */
+    public function index()
+    {
+        $this->success('请求成功');
+    }
+
+    /**
+     * 获取工单抽检记录侧边栏
+     * @ApiMethod (GET)
+     */
+    public function getTab()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $rows = db()->table('db_抽检记录')
+            ->field('LEFT(Sys_rq, 10) as date, COUNT(*) as counts')
+            ->group('date')
+            ->order('UniqId desc')
+            ->limit(45)
+            ->select();
+
+        $arr = db()->table('db_抽检记录')
+            ->field('LEFT(Sys_rq, 10) as date, rtrim(Sys_id) as Sys_id, COUNT(Sys_id) as count')
+            ->where('Sys_rq','>=',$rows[44]['date'])
+            ->group('date, Sys_id')
+            ->order('UniqId desc')
+            ->select();
+
+        foreach($rows as $key=>$value){
+            $rows[$key]['sys'] = [];
+            foreach($arr as $k=>$v){
+                if($value['date'] == $v['date']){
+                    unset($v['date']);
+                    array_push($rows[$key]['sys'],$v);
+                    unset($arr[$k]);
+                }
+            }
+            $rows[$key]['date'] = str_replace('-', '.', $rows[$key]['date']);
+        }
+        $this->success('成功',$rows);
+    }
+
+    /**
+     * 获取工单抽检记录列表
+     * @ApiMethod (GET)
+     * @param string $date 时间
+     * @param string $sys_id 用户
+     */
+    public function getList()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+
+        $page = 1;
+        $limit = 15;
+        if (isset($req['page']) && !empty($req['page'])) $page = $req['page'];
+        if (isset($req['limit']) && !empty($req['limit'])) $limit = $req['limit'];
+
+        $where = [];
+        if (isset($req['date']) && !empty($req['date'])){
+            $where['Sys_rq'] = ['LIKE',$req['date'].'%'];
+        }else{
+            $this->error('参数错误');
+        }
+        if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['Sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
+
+        $rows = db()->table('db_抽检记录')
+            ->field('LEFT(Sczl_rq, 10) as Sczl_rq, Sczl_bh, Sczl_gdbh, rtrim(Sczl_gxmc) as Sczl_gxmc,
+            sczl_yjno, sczl_gxh, Sczl_num, Sczl_抽检数, sczl_A类废, sczl_B类废, sczl_C类废,
+            rtrim(Sczl_desc) as Sczl_desc, rtrim(Sys_id) as Sys_id, Sys_rq, Mod_rq, UniqId')
+            ->where($where)
+            ->order('UniqId asc')
+            ->page($page,$limit)
+            ->select();
+
+        $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
+        foreach ($rows as $key=>$value) {
+            $rows[$key]['Mod_rq'] = $value['Mod_rq']=='1900-01-01 00:00:00' ? '' :$value['Mod_rq'];
+            $rows[$key]['Gd_cpmc'] = array_key_exists($value['Sczl_gdbh'],$gd) ? trim($gd[$value['Sczl_gdbh']]) : '';
+            $rows[$key]['name'] = array_key_exists($value['Sczl_bh'],$rs) ? trim($rs[$value['Sczl_bh']]) : '';
+        }
+
+        $data = [
+            'rows'          => $rows,
+        ];
+        $this->success('成功',$data);
+    }
+
+    /**
+     * 获取工单抽检记录信息
+     * @ApiMethod (GET)
+     * @param string $UniqId UniqId
+     */
+    public function getInfo()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        if (isset($req['UniqId']) && !empty($req['UniqId'])){
+            $UniqId = $req['UniqId'];
+        }else{
+            $this->error('参数错误');
+        }
+
+        $rows = db()->table('db_抽检记录')->alias('d')
+            ->field('d.*, ')
+            ->join('工单_基本资料 g', 'd.')
+            ->where('d.UniqId',$UniqId)
+            ->select();
+
+
+        $this->success('成功',$rows);
+    }
+}

application/api/controller/WorkOrderVerification.php

@@ -53,6 +53,7 @@ class WorkOrderVerification extends Api
                     unset($arr[$k]);
                 }
             }
+            $rows[$key]['date'] = str_replace('-', '.', $rows[$key]['date']);
         }
         $this->success('成功',$rows);
     }
@@ -78,23 +79,27 @@ class WorkOrderVerification extends Api
 
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
-            $where['b.sys_rq'] = ['LIKE',$req['date'].'%'];
+            $where['sys_rq'] = ['LIKE',$req['date'].'%'];
         }else{
             $this->error('参数错误');
         }
-        if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['b.sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
+        if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
 
-        $rows = db()->table('db_qczl')->alias('b')
-            ->field('b.qczl_gdbh, b.qczl_yjno, rtrim(g.Gd_cpmc) as Gd_cpmc, LEFT(b.qczl_rq, 10) as qczl_rq, b.qczl_num, rtrim(b.qczl_NumDesc) as qczl_NumDesc, b.qczl_fp, 
-            b.fp_lb1, b.fp_lb2, b.fp_lb3, b.fp_lb4, b.fp_lb5, b.fp_lb6, b.fp_lb7, b.fp_lb8, b.fp_lb9, b.fp_lb10, b.fp_lb11, b.fp_lb12, b.fp_lb13, b.fp_lb14, b.fp_lb15, b.fp_lb16, b.fp_lb17, 
-            b.fp_sl1, b.fp_sl2, b.fp_sl3, b.fp_sl4, b.fp_sl5, b.fp_sl6, b.fp_sl7, b.fp_sl8, b.fp_sl9, b.fp_sl10, b.fp_sl11, b.fp_sl12, b.fp_sl13, b.fp_sl14, b.fp_sl15, b.fp_sl16, b.fp_sl17, 
-            rtrim(b.sys_id) as sys_id')
+        $rows = db()->table('db_qczl')
+            ->field('qczl_gdbh, qczl_yjno, LEFT(qczl_rq, 10) as qczl_rq, qczl_num, rtrim(qczl_NumDesc) as qczl_NumDesc, qczl_fp, 
+            fp_lb1, fp_lb2, fp_lb3, fp_lb4, fp_lb5, fp_lb6, fp_lb7, fp_lb8, fp_lb9, fp_lb10, fp_lb11, fp_lb12, fp_lb13, fp_lb14, fp_lb15, fp_lb16, fp_lb17, 
+            fp_sl1, fp_sl2, fp_sl3, fp_sl4, fp_sl5, fp_sl6, fp_sl7, fp_sl8, fp_sl9, fp_sl10, fp_sl11, fp_sl12, fp_sl13, fp_sl14, fp_sl15, fp_sl16, fp_sl17, 
+            rtrim(sys_id) as sys_id')
             ->where($where)
-            ->join(['工单_基本资料'=>'g'],'b.qczl_gdbh = g.Gd_gdbh')
-            ->order('b.UniqId desc')
+            ->order('UniqId desc')
             ->page($page,$limit)
             ->select();
+
+        $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        
         foreach ($rows as $key=>$value){
+            $rows[$key]['Gd_cpmc'] = array_key_exists($value['qczl_gdbh'],$gd) ? sprintf("%02d", $value['qczl_yjno']).'-'.trim($gd[$value['qczl_gdbh']]) : '';
+
             for ($i=1;$i<=17;$i++){
                 if ($value['fp_sl'.$i]==0){
                     $rows[$key]['sl_lb'.$i] = '';