Przeglądaj źródła

流程单统计左侧菜单优化

qiuenguang 1 rok temu
rodzic
commit
08c4b1b68a

+ 2 - 2
application/api/controller/WorkOrderVerification.php

@@ -419,8 +419,7 @@ class WorkOrderVerification extends Api
                 ->where($where)
                 ->field('distinct(a.sczl_gxmc),a.sczl_bzdh,a.sczl_jtbh,a.sczl_bh1,b.员工姓名 as name')
                 ->select();
-        }
-        else{
+        }else{
             $search = substr($searchArr[1],0,6);
             $where['a.sczl_type'] = array('like','%'.$search.'%');
             $list = db('设备_产量计酬')->alias('a')
@@ -720,6 +719,7 @@ class WorkOrderVerification extends Api
             ->where(function ($query) {
                 $query->where('Gy0_sbbh', '<>', '')
                     ->whereOr('Gy0_gxmc', '核检')
+                    ->whereOr('Gy0_gxmc', '抽检')
                     ->whereOr('Gy0_gxmc', '成品防护');
             })
             ->field('Gy0_yjno,Gy0_gxh,rtrim(Gy0_gxmc) as Gy0_gxmc')