接口优化

application/api/controller/Inspect.php

@@ -35,7 +35,7 @@ class Inspect extends Api
 
         foreach ($list as $key => $value){
             $where = [$value['sys_rq'].'00:00:00',$value['sys_rq'].'24:00:00'];
-            $dataCount = Db::name('db_手工检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
+            $dataCount = db()->table('db_手工检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
             $list[$key]['count'] = count($dataCount);
             // 提取 sys_id 列成新数组
             $sysIds = array_column($dataCount, 'sys_id');
@@ -64,7 +64,7 @@ class Inspect extends Api
         $list = Db::query($sql);
 
         foreach ($list as $key => $value){
-            $dataCount = Db::name('db_手工检验')->alias('d')
+            $dataCount = db()->table('db_手工检验')->alias('d')
                 ->where('sczl_gdbh',$value['sczl_gdbh'])
                 ->where('SUBSTR(d.sczl_yjgx,1,2) = g.yj_Yjno')
                 ->field('rtrim(d.sys_id) as sys_id, rtrim(g.yj_yjmc) as yj_yjmc')
@@ -123,7 +123,7 @@ class Inspect extends Api
 
         $field = 'a.sczl_gdbh,a.sczl_yjgx,rtrim(a.sczl_gxmc) as sczl_gxmc,DATE(a.sczl_rq) as sczl_rq,a.sczl_cl,a.sczl_dedh,a.sczl_废品率系数,a.sczl_检验类别,a.sczl_bh0,
         rtrim(a.qczl_NumDesc) as qczl_NumDesc,rtrim(a.sys_id) as sys_id,a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c.员工姓名) as 员工姓名,rtrim(d.yj_yjmc) as yj_yjmc';
-        $list = Db::name('db_手工检验')->alias('a')
+        $list = db()->table('db_手工检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c','a.sczl_bh0 = c.员工编号','left')
             ->join('工单_印件资料 d','a.sczl_gdbh = d.Yj_Gdbh','left')
@@ -131,7 +131,7 @@ class Inspect extends Api
             ->where('SUBSTR(a.sczl_yjgx,1,2) = d.yj_Yjno')
             ->field($field)->page($page,$limit)->order('a.sczl_rq,a.UniqId asc')->select();
 
-        $count = Db::name('db_手工检验')->where($option)->count();
+        $count = db()->table('db_手工检验')->where($option)->count();
 
         $data['data'] = $list;
         $data['total'] = $count;
@@ -152,7 +152,7 @@ class Inspect extends Api
         $list = Db::query($sql);
         foreach ($list as $key => $value){
             $where = [$value['sys_rq'].'00:00:00',$value['sys_rq'].'24:00:00'];
-            $dataCount = Db::name('db_机器检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
+            $dataCount = db()->table('db_机器检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
             $list[$key]['count'] = count($dataCount);
             // 提取 sys_id 列成新数组
             $sysIds = array_column($dataCount, 'sys_id');
@@ -203,7 +203,7 @@ class Inspect extends Api
         a.sczl_设备运行工时,a.sczl_dedh,a.sczl_废品率系数,rtrim(a.sczl_检验类别) as sczl_检验类别,a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.qczl_NumDesc,rtrim(a.sys_id) as sys_id,
         a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c1.员工姓名) as sczl_bh1_name,rtrim(c2.员工姓名) as sczl_bh2_name,rtrim(c3.员工姓名) as sczl_bh3_name,
         rtrim(c4.员工姓名) as sczl_bh4_name,rtrim(d.yj_yjmc) as yj_yjmc';
-        $list = Db::name('db_机器检验')->alias('a')
+        $list = db()->table('db_机器检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
             ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')
@@ -213,7 +213,7 @@ class Inspect extends Api
             ->where($where)
             ->where('SUBSTR(a.sczl_yjgx,1,2) = d.yj_Yjno')
             ->field($field)->page($page,$limit)->order('a.UniqId desc')->select();
-        $count = Db::name('db_机器检验')->where($option)->count();
+        $count = db()->table('db_机器检验')->where($option)->count();
 
         $data['data'] = $list;
         $data['total'] = $count;
@@ -248,7 +248,7 @@ class Inspect extends Api
 
             $field = 'a.sczl_gdbh,a.sczl_yjgx,rtrim(a.sczl_gxmc) as sczl_gxmc,DATE(a.sczl_rq) as sczl_rq,a.sczl_cl,a.sczl_dedh,a.sczl_废品率系数,a.sczl_检验类别,a.sczl_bh0,
         rtrim(a.qczl_NumDesc) as qczl_NumDesc,rtrim(a.sys_id) as sys_id,a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c.员工姓名) as 员工姓名,rtrim(d.yj_yjmc) as yj_yjmc';
-            $rows = Db::name('db_手工检验')->alias('a')
+            $rows = db()->table('db_手工检验')->alias('a')
                 ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
                 ->join('人事_基本资料 c','a.sczl_bh0 = c.员工编号','left')
                 ->join('工单_印件资料 d','a.sczl_gdbh = d.Yj_Gdbh','left')
@@ -257,7 +257,7 @@ class Inspect extends Api
                 ->field($field)->page($page,$limit)->order('a.sczl_rq,a.UniqId asc')->select();
 
             $option['sczl_gdbh'] = [ 'like', '%' . $req['gdbh'] . '%'];
-            $total = Db::name('db_手工检验')->where($option)->count();
+            $total = db()->table('db_手工检验')->where($option)->count();
         }else{
             if (isset($req['cpmc']) && !empty($req['cpmc'])){
                 //查询工单表
@@ -269,7 +269,7 @@ class Inspect extends Api
                 ];
                 $field = 'a.sczl_gdbh,a.sczl_yjgx,rtrim(a.sczl_gxmc) as sczl_gxmc,DATE(a.sczl_rq) as sczl_rq,a.sczl_cl,a.sczl_dedh,a.sczl_废品率系数,a.sczl_检验类别,a.sczl_bh0,
         rtrim(a.qczl_NumDesc) as qczl_NumDesc,rtrim(a.sys_id) as sys_id,a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c.员工姓名) as 员工姓名,rtrim(d.yj_yjmc) as yj_yjmc';
-                $rows = Db::name('db_手工检验')->alias('a')
+                $rows = db()->table('db_手工检验')->alias('a')
                     ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
                     ->join('人事_基本资料 c','a.sczl_bh0 = c.员工编号','left')
                     ->join('工单_印件资料 d','a.sczl_gdbh = d.Yj_Gdbh','left')
@@ -278,7 +278,7 @@ class Inspect extends Api
                     ->field($field)->page($page,$limit)->order('a.sczl_rq,a.UniqId asc')->select();
 
                 $option['sczl_gdbh'] = ['in', $gd];
-                $total = Db::name('db_手工检验')->where($option)->count();
+                $total = db()->table('db_手工检验')->where($option)->count();
             }else{
                 $this->error('参数错误');
             }
@@ -321,7 +321,7 @@ class Inspect extends Api
         a.sczl_设备运行工时,a.sczl_dedh,a.sczl_废品率系数,rtrim(a.sczl_检验类别) as sczl_检验类别,a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.qczl_NumDesc,rtrim(a.sys_id) as sys_id,
         a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c1.员工姓名) as sczl_bh1_name,rtrim(c2.员工姓名) as sczl_bh2_name,rtrim(c3.员工姓名) as sczl_bh3_name,
         rtrim(c4.员工姓名) as sczl_bh4_name,rtrim(d.yj_yjmc) as yj_yjmc';
-            $rows = Db::name('db_机器检验')->alias('a')
+            $rows = db()->table('db_机器检验')->alias('a')
                 ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
                 ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
                 ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')
@@ -333,7 +333,7 @@ class Inspect extends Api
                 ->field($field)->page($page,$limit)->order('a.sczl_rq asc,a.UniqId desc')->select();
             $option['sczl_单据类型'] = '初检单';
             $option['sczl_gdbh'] = [ 'like', '%' . $req['gdbh'] . '%'];
-            $total = Db::name('db_机器检验')->where($option)->count();
+            $total = db()->table('db_机器检验')->where($option)->count();
 
         }else{
             if (isset($req['cpmc']) && !empty($req['cpmc'])){
@@ -349,7 +349,7 @@ class Inspect extends Api
         a.sczl_设备运行工时,a.sczl_dedh,a.sczl_废品率系数,rtrim(a.sczl_检验类别) as sczl_检验类别,a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.qczl_NumDesc,rtrim(a.sys_id) as sys_id,
         a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c1.员工姓名) as sczl_bh1_name,rtrim(c2.员工姓名) as sczl_bh2_name,rtrim(c3.员工姓名) as sczl_bh3_name,
         rtrim(c4.员工姓名) as sczl_bh4_name,rtrim(d.yj_yjmc) as yj_yjmc';
-                $rows = Db::name('db_机器检验')->alias('a')
+                $rows = db()->table('db_机器检验')->alias('a')
                     ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
                     ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
                     ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')
@@ -361,7 +361,7 @@ class Inspect extends Api
                     ->field($field)->page($page,$limit)->order('a.sczl_rq asc,a.UniqId desc')->select();
                 $option['sczl_单据类型'] = '初检单';
                 $option['sczl_gdbh'] = ['in', $gd];
-                $total = Db::name('db_机器检验')->where($option)->count();
+                $total = db()->table('db_机器检验')->where($option)->count();
             }else{
                 $this->error('参数错误');
             }
@@ -411,7 +411,7 @@ class Inspect extends Api
         a.sczl_cl7,a.sczl_cl8,a.sczl_cl9,a.sczl_cl10,a.sczl_cl11,a.sczl_cl12,
         a.sczl_fp1,a.sczl_fp2,a.sczl_fp3,a.sczl_fp4,a.sczl_fp5,a.sczl_fp6,
         a.sczl_fp7,a.sczl_fp8,a.sczl_fp9,a.sczl_fp10,a.sczl_fp11,a.sczl_fp12';
-        $rows = Db::name('db_手工检验')->alias('a')
+        $rows = db()->table('db_手工检验')->alias('a')
             ->join('人事_基本资料 c0','a.sczl_bh0 = c0.员工编号','left')
             ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
             ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')
@@ -466,7 +466,7 @@ class Inspect extends Api
         rtrim(c5.员工姓名) as sczl_bh5_name,rtrim(c6.员工姓名) as sczl_bh6_name,
         rtrim(c7.员工姓名) as sczl_bh7_name,rtrim(c8.员工姓名) as sczl_bh8_name,
         rtrim(d.yj_yjmc) as yj_yjmc';
-        $rows = Db::name('db_机器检验')->alias('a')
+        $rows = db()->table('db_机器检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
             ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')
@@ -1053,7 +1053,7 @@ class Inspect extends Api
             }
         }
 
-        $rows = Db::name('db_手工检验')->alias('a')
+        $rows = db()->table('db_手工检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c','a.sczl_bh0 = c.员工编号','left')
             ->join('工单_印件资料 d','a.sczl_gdbh = d.Yj_Gdbh','left')
@@ -1140,7 +1140,7 @@ class Inspect extends Api
             }
         }
 
-        $rows = Db::name('db_机器检验')->alias('a')
+        $rows = db()->table('db_机器检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')
             ->join('人事_基本资料 c2','a.sczl_bh2 = c2.员工编号','left')

application/api/controller/MachineProductionReport.php

@@ -590,7 +590,7 @@ class MachineProductionReport extends Api
             $this->error('参数错误');
         }
 
-        $row = db('工单_基本资料')
+        $row = db()->table('工单_基本资料')
             ->field('rtrim(Gd_cpmc) as Gd_cpmc')
             ->where('Gd_gdbh',$gdbh)
             ->find();
@@ -624,7 +624,7 @@ class MachineProductionReport extends Api
             $this->error('参数错误');
         }
 
-        $row = db('工单_印件资料')
+        $row = db()->table('工单_印件资料')
             ->field('rtrim(yj_yjmc) as yj_yjmc')
             ->where(['Yj_Gdbh'=>$gdbh,'yj_Yjno'=>$yjno])
             ->find();
@@ -664,7 +664,7 @@ class MachineProductionReport extends Api
             $keyword = '';
         }
 
-        $rows = db('工单_工艺资料')
+        $rows = db()->table('工单_工艺资料')
             ->field('Gy0_gxh as sczl_gxh, rtrim(Gy0_gxmc) as sczl_type, rtrim(Add_gxmc) as Add_gxmc,Gy0_ls as sczl_ls, Gy0_ms as sczl_ms')
             ->where(['Gy0_gdbh'=>$gdbh,'Gy0_yjno'=>$yjno])
             ->where('Gy0_gxh|Gy0_gxmc|Add_gxmc','like','%'.$keyword.'%')
@@ -703,11 +703,22 @@ class MachineProductionReport extends Api
             ->select();
         foreach ($rows as $key=>$value){
             $bool = db()->table('dic_lzde')
-                ->field('sys_bh, rtrim(sys_mc) as sys_mc')
+                ->field('Key_,sys_bh, rtrim(sys_mc) as sys_mc')
                 ->where('Parent',$value['Key_'])
                 ->order('sys_bh asc')
                 ->select();
             if ($bool){
+                foreach ($bool as $k=>$v){
+                    $bool1 = db()->table('dic_lzde')
+                        ->field('sys_bh, rtrim(sys_mc) as sys_mc')
+                        ->where('Parent',$v['Key_'])
+                        ->order('sys_bh asc')
+                        ->select();
+
+                    if ($bool1){
+                        $bool[$k]['bh_mc'] = $bool1;
+                    }
+                }
                 $rows[$key]['bh_mc'] = $bool;
             }
         }