计件工资

application/api/controller/EmployeeDailySalary.php

@@ -108,7 +108,7 @@ class EmployeeDailySalary extends Api
             sum(个人加班工资) as 加班工资,(sum(个人计件工资)+sum(个人加班工资)) as 日工资合计')
             ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10)')
             ->where('sys_ny',$req['date'])
-            ->where('人事_基本资料.所在部门',$req['department'])
+            ->where(['人事_基本资料.所在部门'=>['like',$req['department'].'%']])
             ->select();
         if(!$res){
             $this->error('失败');
@@ -122,35 +122,35 @@ class EmployeeDailySalary extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-        $res1=db()->table('db_wgjs1')
+        $res1=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh1','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh1','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res2=db()->table('db_wgjs1')
+        $res2=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh2','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh2','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res3=db()->table('db_wgjs1')
+        $res3=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh3','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh3','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res4=db()->table('db_wgjs1')
+        $res4=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh4','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh4','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res5=db()->table('db_wgjs1')
+        $res5=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh5','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh5','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res6=db()->table('db_wgjs1')
+        $res6=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh6','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh6','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
         $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
         foreach($arr as $v){
@@ -161,12 +161,12 @@ class EmployeeDailySalary extends Api
             }
         }
         foreach($res as &$v){
-            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
             if(isset($list[$v['sczl_rq']][$v['bh']])){
                 $v['计时']=$list[$v['sczl_rq']][$v['bh']];
             }else{
                 $v['计时']='';
             }  
+            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
         }
         $this->success('成功',$res);
     }
@@ -324,34 +324,34 @@ class EmployeeDailySalary extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-        $res1=db()->table('db_wgjs1')
+        $res1=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh1','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh1','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
         ->select();
-        $res2=db()->table('db_wgjs1')
+        $res2=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh2','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh2','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh2'=>$req['search']])
         ->select();
-        $res3=db()->table('db_wgjs1')
+        $res3=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh3','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh3','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh3'=>$req['search']])
         ->select();
-        $res4=db()->table('db_wgjs1')
+        $res4=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh4','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh4','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh4'=>$req['search']])
         ->select();
-        $res5=db()->table('db_wgjs1')
+        $res5=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh5','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh5','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh5'=>$req['search']])
         ->select();
-        $res6=db()->table('db_wgjs1')
+        $res6=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        // ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh6','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh6'=>$req['search']])
         ->select();
         $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
@@ -392,7 +392,7 @@ class EmployeeDailySalary extends Api
         if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
             $this->error('参数不能为空');
         }
-        $rows = db()->table('db_wgjs1')
+        $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, 
@@ -403,12 +403,12 @@ class EmployeeDailySalary extends Api
         rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
         as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
         as name6,wgjs_冲定额1,wgjs_冲定额2,wgjs_冲定额3,wgjs_冲定额4,wgjs_冲定额5,wgjs_冲定额6')
-        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs1.wgjs_bh1','LEFT')
-        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs1.wgjs_bh2','LEFT')
-        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs1.wgjs_bh3','LEFT')
-        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs1.wgjs_bh4','LEFT')
-        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs1.wgjs_bh5','LEFT')
-        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs.wgjs_bh1','LEFT')
+        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs.wgjs_bh2','LEFT')
+        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs.wgjs_bh3','LEFT')
+        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs.wgjs_bh4','LEFT')
+        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs.wgjs_bh5','LEFT')
+        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs.wgjs_bh6','LEFT')
         ->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
         ->find();
         if($rows){
@@ -442,7 +442,7 @@ class EmployeeDailySalary extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
+            $sql = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
             ->fetchSql(true)->update($req);
             $res= db()->query($sql);
             // 提交事务
@@ -481,7 +481,7 @@ class EmployeeDailySalary extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->fetchSql(true)->insert($req);
+            $sql = db()->table('db_wgjs')->fetchSql(true)->insert($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();
@@ -515,7 +515,7 @@ class EmployeeDailySalary extends Api
         if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
             $this->error('参数不能为空');
         }
-        $rows = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
+        $rows = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
         ->delete();
         if($rows){
         $this->success('成功');

application/api/controller/OvertimeVerification.php

@@ -121,7 +121,7 @@ class OvertimeVerification extends Api
             ->group('LEFT(sczl_rq, 10),绩效工资汇总.bh')
             // ->group('绩效工资汇总.bh')
             ->where('sys_ny',$req['date'])
-            ->where('人事_基本资料.所在部门',$req['department'])
+            ->where(['人事_基本资料.所在部门'=>['like',$req['department'].'%']])
             ->buildSql(true);
             // ->select();
         if(!$res){
@@ -141,35 +141,35 @@ class OvertimeVerification extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-        $res1=db()->table('db_wgjs1')
+        $res1=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh1','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh1','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res2=db()->table('db_wgjs1')
+        $res2=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh2','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh2','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res3=db()->table('db_wgjs1')
+        $res3=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh3','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh3','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res4=db()->table('db_wgjs1')
+        $res4=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh4','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh4','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res5=db()->table('db_wgjs1')
+        $res5=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh5','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh5','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
-        $res6=db()->table('db_wgjs1')
+        $res6=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
-        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh6','LEFT')
-        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs.wgjs_bh6','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
         ->select();
         $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
         foreach($arr as $v){
@@ -316,27 +316,27 @@ class OvertimeVerification extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-        $res1=db()->table('db_wgjs1')
+        $res1=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
         ->select();
-        $res2=db()->table('db_wgjs1')
+        $res2=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh2'=>$req['search']])
         ->select();
-        $res3=db()->table('db_wgjs1')
+        $res3=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh3'=>$req['search']])
         ->select();
-        $res4=db()->table('db_wgjs1')
+        $res4=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh4'=>$req['search']])
         ->select();
-        $res5=db()->table('db_wgjs1')
+        $res5=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh5'=>$req['search']])
         ->select();
-        $res6=db()->table('db_wgjs1')
+        $res6=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh6'=>$req['search']])
         ->select();

application/api/controller/PieceWorkSchedule.php

@@ -32,7 +32,7 @@ class PieceWorkSchedule extends Api
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
-        $rows = db()->table('db_wgjs1')
+        $rows = db()->table('db_wgjs')
             ->field('LEFT(wgjs_rq, 7) as date')
             ->group('date')
             ->order('UniqId desc')
@@ -70,7 +70,7 @@ class PieceWorkSchedule extends Api
             $this->error('参数错误');
         }
 
-        $rows = db()->table('db_wgjs1')
+        $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, 
@@ -82,7 +82,7 @@ class PieceWorkSchedule extends Api
             ->order('wgjs_rq desc, UniqId asc')
             ->page($page,$limit)
             ->select();
-        $total = db()->table('db_wgjs1')->where($where)->count();
+        $total = db()->table('db_wgjs')->where($where)->count();
 
         $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名, 所在部门');
 
@@ -178,7 +178,7 @@ class PieceWorkSchedule extends Api
         if($yg){
             $req['search']=$yg;
         }
-        $rows = db()->table('db_wgjs1')
+        $rows = db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 10) as wgjs_rq, 
         wgjs_bh1,rs1.所在部门, 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, 
@@ -189,15 +189,15 @@ class PieceWorkSchedule extends Api
         rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
         as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
         as name6')
-        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs1.wgjs_bh1','LEFT')
-        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs1.wgjs_bh2','LEFT')
-        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs1.wgjs_bh3','LEFT')
-        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs1.wgjs_bh4','LEFT')
-        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs1.wgjs_bh5','LEFT')
-        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs.wgjs_bh1','LEFT')
+        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs.wgjs_bh2','LEFT')
+        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs.wgjs_bh3','LEFT')
+        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs.wgjs_bh4','LEFT')
+        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs.wgjs_bh5','LEFT')
+        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs.wgjs_bh6','LEFT')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
         ->select();
-        $total = db()->table('db_wgjs1')->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])->count();
+        $total = db()->table('db_wgjs')->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])->count();
         $data = ['total'=> $total,'rows'=> $rows];
         if($rows){
             $this->success('成功',$data);
@@ -225,7 +225,7 @@ class PieceWorkSchedule extends Api
         if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
             $this->error('参数不能为空');
         }
-        $rows = db()->table('db_wgjs1')
+        $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, 
@@ -236,12 +236,12 @@ class PieceWorkSchedule extends Api
         rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
         as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
         as name6,wgjs_冲定额1,wgjs_冲定额2,wgjs_冲定额3,wgjs_冲定额4,wgjs_冲定额5,wgjs_冲定额6')
-        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs1.wgjs_bh1','LEFT')
-        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs1.wgjs_bh2','LEFT')
-        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs1.wgjs_bh3','LEFT')
-        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs1.wgjs_bh4','LEFT')
-        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs1.wgjs_bh5','LEFT')
-        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs.wgjs_bh1','LEFT')
+        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs.wgjs_bh2','LEFT')
+        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs.wgjs_bh3','LEFT')
+        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs.wgjs_bh4','LEFT')
+        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs.wgjs_bh5','LEFT')
+        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs.wgjs_bh6','LEFT')
         ->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
         ->find();
         if($rows){
@@ -275,7 +275,7 @@ class PieceWorkSchedule extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
+            $sql = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
             ->fetchSql(true)->update($req);
             $res= db()->query($sql);
             // 提交事务
@@ -314,7 +314,7 @@ class PieceWorkSchedule extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->fetchSql(true)->insert($req);
+            $sql = db()->table('db_wgjs')->fetchSql(true)->insert($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();
@@ -348,7 +348,7 @@ class PieceWorkSchedule extends Api
         if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
             $this->error('参数不能为空');
         }
-        $rows = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
+        $rows = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
         ->delete();
         if($rows){
         $this->success('成功');

application/api/controller/RelatedSalaryAccounting.php

@@ -220,27 +220,27 @@ class RelatedSalaryAccounting extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-        $res1=db()->table('db_wgjs1')
+        $res1=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
         ->select();
-        $res2=db()->table('db_wgjs1')
+        $res2=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh2'=>$req['search']])
         ->select();
-        $res3=db()->table('db_wgjs1')
+        $res3=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh3'=>$req['search']])
         ->select();
-        $res4=db()->table('db_wgjs1')
+        $res4=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh4'=>$req['search']])
         ->select();
-        $res5=db()->table('db_wgjs1')
+        $res5=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh5'=>$req['search']])
         ->select();
-        $res6=db()->table('db_wgjs1')
+        $res6=db()->table('db_wgjs')
         ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
         ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh6'=>$req['search']])
         ->select();

application/api/controller/WorkOrderSpotCheck.php

@@ -31,14 +31,14 @@ class WorkOrderSpotCheck extends Api
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
-        $rows = db()->table('db_抽检记录1')
+        $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_抽检记录1')
+        $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')
@@ -86,7 +86,7 @@ class WorkOrderSpotCheck extends Api
         }
         if (isset($req['sys_id']) && !empty($req['sys_id'])) $where['Sys_id'] = ['LIKE','%'.$req['sys_id'].'%'];
 
-        $rows = db()->table('db_抽检记录1')
+        $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')
@@ -95,7 +95,7 @@ class WorkOrderSpotCheck extends Api
             ->page($page,$limit)
             ->select();
 
-        $total = db()->table('db_抽检记录1')->where($where)->count();
+        $total = db()->table('db_抽检记录')->where($where)->count();
         $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
         $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
         foreach ($rows as $key=>$value) {
@@ -132,13 +132,13 @@ class WorkOrderSpotCheck extends Api
             $this->error('参数错误');
         }
 
-        $rows = db()->table('db_抽检记录1')
+        $rows = db()->table('db_抽检记录')
         ->field('Sczl_bh,rtrim(rs.员工姓名) as name,rtrim(sczl_bzdh) as sczl_bzdh ,LEFT(Sczl_rq, 10) as Sczl_rq,
         Sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc, rtrim(Sczl_gxmc) as Sczl_gxmc,sczl_gxh,Sczl_num,Sczl_抽检数,
         Sczl_A类废,Sczl_B类废,Sczl_C类废,rtrim(Sczl_desc) as Sczl_desc')
-        ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录1.Sczl_bh','LEFT')
-        ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录1.Sczl_gdbh','LEFT')
-        ->where('db_抽检记录1.UniqId',$UniqId)->limit(1)->select();
+        ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录.Sczl_bh','LEFT')
+        ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录.Sczl_gdbh','LEFT')
+        ->where('db_抽检记录.UniqId',$UniqId)->limit(1)->select();
 
         if($rows){
             $this->success('成功',$rows);
@@ -172,16 +172,16 @@ class WorkOrderSpotCheck extends Api
         if($gd){
             $search=$gd;
         }
-        $rows = db()->table('db_抽检记录1')
+        $rows = db()->table('db_抽检记录')
         ->field('Sczl_bh,sczl_yjno,rtrim(rs.员工姓名) as name,LEFT(Sczl_rq, 10) as Sczl_rq,
         Sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc, rtrim(Sczl_gxmc) as Sczl_gxmc,sczl_gxh,Sczl_num,Sczl_抽检数,
-        Sczl_A类废,Sczl_B类废,Sczl_C类废,rtrim(Sczl_desc) as Sczl_desc,rtrim(db_抽检记录1.Sys_id) as Sys_id,
-        db_抽检记录1.Sys_rq,db_抽检记录1.Mod_rq,db_抽检记录1.UniqId')
-        ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录1.Sczl_bh','LEFT')
-        ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录1.Sczl_gdbh','LEFT')
-        ->where('db_抽检记录1.Sczl_gdbh',$search)
+        Sczl_A类废,Sczl_B类废,Sczl_C类废,rtrim(Sczl_desc) as Sczl_desc,rtrim(db_抽检记录.Sys_id) as Sys_id,
+        db_抽检记录.Sys_rq,db_抽检记录.Mod_rq,db_抽检记录.UniqId')
+        ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录.Sczl_bh','LEFT')
+        ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录.Sczl_gdbh','LEFT')
+        ->where('db_抽检记录.Sczl_gdbh',$search)
         ->page($page,$limit)->select();
-        $total = db()->table('db_抽检记录1')->where('db_抽检记录1.Sczl_gdbh',$search)->count();
+        $total = db()->table('db_抽检记录')->where('db_抽检记录.Sczl_gdbh',$search)->count();
         $data = ['total'=> $total,'rows'=> $rows];
          if($rows){
             $this->success('成功',$data);
@@ -215,7 +215,7 @@ class WorkOrderSpotCheck extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_抽检记录1')->where('UniqId',$UniqId)->fetchSql(true)->update($req);
+            $sql = db()->table('db_抽检记录')->where('UniqId',$UniqId)->fetchSql(true)->update($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();
@@ -255,7 +255,7 @@ class WorkOrderSpotCheck extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_抽检记录1')->fetchSql(true)->insert($req);
+            $sql = db()->table('db_抽检记录')->fetchSql(true)->insert($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();
@@ -286,7 +286,7 @@ class WorkOrderSpotCheck extends Api
             $this->error('参数错误');
         }
 
-        $rows = db()->table('db_抽检记录1')->where('UniqId',$UniqId)->delete();
+        $rows = db()->table('db_抽检记录')->where('UniqId',$UniqId)->delete();
         if($rows){
            $this->success('成功');
         }else{