优化接口新增参数, config文件修改

application/api/controller/OvertimeVerification.php

@@ -119,7 +119,7 @@ class OvertimeVerification extends Api
             ->where('j.sys_ny',$req['date'])
             ->where(['r.所在部门'=>['like',$req['department'].'%']])
             ->column('CONCAT(j.bh, "-", DATE_FORMAT(sczl_rq,"%Y.%m")) AS rq_bh,j.bh,rtrim(j.xm) as 员工姓名,r.工资表类别,DATE_FORMAT(r.聘用日期,"%Y.%m.%d") as 聘用日期,j.法定天数,
-            sum(j.日定额) as 当月定额,(sum(j.班组车头产量*j.工序难度系数)+sum(j.班组换算产量)) as 月度合计产量,sum(j.个人计件工资) as 个人计件工资,
+            sum(j.达标定额) as 当月定额,(sum(j.班组车头产量*j.工序难度系数)+sum(j.班组换算产量)) as 月度合计产量,sum(j.个人计件工资) as 个人计件工资,
             sum(j.个人加班工资) as 个人加班工资,sum(j.异常停机工时) as 月计时时数,LEFT(j.sczl_rq, 7) as sczl_rq');
 
         $year=substr($req['date'],0,4);
@@ -180,12 +180,12 @@ class OvertimeVerification extends Api
         }
         $req = $this->request->param();
         $res=db('绩效工资汇总')->cache(true,86400)
-            ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc,sczl_yjno,sczl_gxh,sczl_type,
+            ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.成品名称) as Gd_cpmc,sczl_yjno,sczl_gxh,sczl_type,
             sczl_jtbh,sum(班组车头产量) as 班组车头产量,工序难度系数 as 产量系数,(sum(班组车头产量*工序难度系数)) as 计件产量,
             sum(班组换算产量) as 补产产量,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 核算产量,日定额,sum(达标定额)
             as 达标定额,千件工价,补产标准,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,Rate as 个人比例,
             sum(装版工时) as 装版工时,sum(保养工时) as 保养工时,sum(打样工时) as 打样工时,sum(计时补差额工资) as 计时补差')
-            ->join('工单_基本资料 g','g.Gd_gdbh=绩效工资汇总.sczl_gdbh','LEFT')
+            ->join('工单_基本资料 g','g.Gd_gdbh=绩效工资汇总.sczl_gdbh AND g.行号=1')
             ->group('LEFT(sczl_rq, 10),sczl_gdbh')
             ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
             ->select();
@@ -268,6 +268,8 @@ class OvertimeVerification extends Api
         }
         $req = $this->request->param();
         $yg = db()->table('人事_基本资料')->where('员工姓名',$req['search'])->value('员工编号');
+        // $yg = db()->table('人事_基本资料')->where('员工姓名','like','%'.$req['search'].'%')->column('员工编号');
+
         if($yg){
             $req['search']=$yg;
         }

application/api/controller/RelatedSalaryAccounting.php

@@ -562,17 +562,14 @@ class RelatedSalaryAccounting extends Api
                 ->where(['日期'=>$v['date'].' 00:00:00','关联员工'=>$v['关联员工'],'被关联员工'=>$v['被关联员工']])
                 ->find();
             if($bool) continue;
-
-            //获取用户信息
-            $sys_id = '[1002/郑小丽]';
             
             $rows[$k] = [
+                'sys_id' => $v['sys_id'],
                 '日期' => $v['date'].' 00:00:00',
                 '关联员工' => $v['关联员工'],
                 '关联系数' => $v['关联系数'],
                 '被关联员工' => $v['被关联员工'],
                 '权重' => 1.00,
-                'sys_id' => $sys_id,
                 'sys_rq' => $date,
                 'UniqID' => $UniqID+$i,
             ];
@@ -654,13 +651,15 @@ class RelatedSalaryAccounting extends Api
                 db()->table('人事_关联工资设置')
                    ->where(['关联员工'=>$v['关联员工'],'日期'=>$v['new_time']])
                    ->delete();
-                $data=Db::table('人事_关联工资设置')
-                   ->field('日期,关联员工,关联系数,被关联员工,权重,sys_id')
+                $data=db('人事_关联工资设置')
+                   ->field('关联员工,关联系数,被关联员工,权重')
                    ->where(['关联员工'=>$v['关联员工'],'日期'=>$v['old_time']])
                    ->select();
-                $id=Db::table('人事_关联工资设置')->order('UniqID desc')->limit(1)->value('UniqID');
+                   
+                $id=db('人事_关联工资设置')->order('UniqID desc')->limit(1)->value('UniqID');
                 $i=1;
                 foreach($data as &$value){
+                    $value['sys_id']=$v['sys_id'];
                     $value['日期']=$v['new_time'];
                     $value['UniqID']=$i+$id;
                     $value['sys_rq']=date('Y-m-d H:i:s');

application/config.php

@@ -20,7 +20,7 @@ return [
     // 应用调试模式
     'app_debug'              => Env::get('app.debug', true),
     // 应用Trace
-    'app_trace'              => Env::get('app.trace', true),
+    'app_trace'              => Env::get('app.trace', false),
     // 应用模式状态
     'app_status'             => '',
     // 是否支持多模块
@@ -303,7 +303,7 @@ return [
         //插件纯净模式，插件启用后是否删除插件目录的application、public和assets文件夹
         'addon_pure_mode'       => true,
         //允许跨域的域名,多个以,分隔
-        'cors_request_domain'   => 'localhost,127.0.0.1',
+        'cors_request_domain'   => Env::get('app.cors_request_domain', ""),
         //版本号
         'version'               => '1.4.0.20230711',
         //API接口地址