日工资核算

application/api/controller/EmployeeDailySalary.php

@@ -90,7 +90,7 @@ class EmployeeDailySalary extends Api
     
 
     /**
-     * 员工日工资查询列表
+     * 员工日工资查询上侧列表
      * @ApiMethod (GET)
      * @param string $date 年月
      * @param string $department 部门
@@ -171,7 +171,7 @@ class EmployeeDailySalary extends Api
         $this->success('成功',$res);
     }
     /**
-     * 员工日工资查询列表
+     * 员工日工资查询下侧列表
      * @ApiMethod (GET)
      * @param string $date 年月
      * @param string $code 员工编号
@@ -372,155 +372,176 @@ class EmployeeDailySalary extends Api
         }
         $this->success('成功',$res);
     }
-    /**
-     * 详情
+     /**
+     * 员工计件明细
      * @ApiMethod (GET)
-     * @param string $wgjs_rq 日期
-     * @param string $wgjs_bh1 员工编号
-    */
-    public function detail(){
+     * @param string $start_time
+     * @param string $end_time
+     * @param string $code 员工编号
+     */
+    public function getPieceDetail()
+    {
         //get请求
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-
-        if (!isset($req['wgjs_rq']) || !isset($req['wgjs_bh1']) ){
-            $this->error('参数错误');
-        }else{
-        }
-        if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
-            $this->error('参数不能为空');
-        }
-        $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,
-        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_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){
-        $this->success('成功',$rows);
-        }else{
+        $req['start_time']=str_replace('.','-',$req['start_time']);
+        $req['end_time']=str_replace('.','-',$req['end_time']);
+        $start_time=$req['start_time'].' 00:00:00';
+        $end_time=$req['end_time'].' 23:59:59';
+        $res=db()->table('绩效工资汇总')
+           ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.员工姓名) as 员工资料,sczl_yjno,sczl_gxh,sczl_type,
+            sczl_jtbh,班组车头产量,保养工时,装版工时,打样工时,异常停机工时,补产标准,计时补差额工资 as 班组补产,日定额,达标定额,千件工价,
+            个人计件工资,个人加班工资,Rate as 个人比例')
+            ->join('人事_基本资料 g','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
+            ->where(['sczl_rq'=>['between',"$start_time,$end_time"],'bh'=>$req['code']])
+            ->select();
+        if(!$res){
             $this->error('失败');
-        }   
-    }
-     /**
-     * 修改
-     * @ApiMethod POST
-    */
-    public function edit()
-    {
-        if(!$this->request->isPost()){
-            $this->error('请求方式错误');
-        }
-        $req = $this->request->param();
-        // $req = ['wgjs_js1'=>12,'wgjs_rq'=>'2023-10-12','wgjs_bh1'=>'ZM01269'];
-
-        if (!isset($req['wgjs_rq']) || !isset($req['wgjs_bh1']) ){
-            $this->error('参数错误');
-        }
-        if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
-            $this->error('参数不能为空');
         }
-
-        $req['wgjs_rq'] = $req['wgjs_rq'].' 00:00:00';
-        $req['mod_rq'] = date('Y-m-d H:i:s');
-
-        //开启事务
-        db()->startTrans();
-        try{
-            $sql = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
-            ->fetchSql(true)->update($req);
-            $res= db()->query($sql);
-            // 提交事务
-            db()->commit();
-        } catch (\Exception $e) {
-            // 回滚事务
-            db()->rollback();
-            $this->error($e->getMessage());
+        foreach($res as &$v){
+            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
+            if($v['sczl_yjno']>9){
+                $sczl_yjno=$v['sczl_yjno'];
+            }else{
+                $sczl_yjno='0'.$v['sczl_yjno'];
+            }
+            unset($v['sczl_yjno']);
+            if($v['sczl_gxh']>9){
+                $sczl_gxh=$v['sczl_gxh'];
+            }else{
+                $sczl_gxh='0'.$v['sczl_gxh'];
+            }
+            unset($v['sczl_gxh']);
+            $v['sczl_type']=$sczl_yjno.'-'.$sczl_gxh.'-->'.$v['sczl_type'];
+            $v['班组补产']=$v['补产标准']*($v['保养工时']+$v['装版工时']+$v['打样工时']+$v['异常停机工时']);
         }
-
-        if($res===false) $this->error('失败');
-
-        $this->success('成功');
+        $this->success('成功',$res);
     }
-      /**
-     * 新增
-     * @ApiMethod POST
-    */
-    public function add()
+     /**
+     * 每日工资统计
+     * @ApiMethod (GET)
+     * @param string $date 年月
+     * @param string $department 部门
+     */
+    public function statistics()
     {
-        if(!$this->request->isPost()){
+        //get请求
+        if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-
-        if (!isset($req['wgjs_rq']) || !isset($req['wgjs_bh1']) ){
-            $this->error('参数错误');
+        $res=db()->table('绩效工资汇总')
+            ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
+            ->field('bh,rtrim(xm) as 员工姓名,LEFT(sczl_rq, 10) as sczl_rq,sum(个人计件工资) as 计件工资,
+            sum(个人加班工资) as 加班工资')
+            ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10)')
+            ->where('sys_ny',$req['date'])
+            ->where(['人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+            ->select();
+        if(!$res){
+            $this->error('失败');
         }
-        if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
-            $this->error('参数不能为空');
+        $year=substr($req['date'],0,4);
+        $month=substr($req['date'],-2);
+        if($month==12){
+            $start_time=$year.'-12-01 00:00:00';
+            $end_time=($year+1).'-01-01 00:00:00';
+        }else{
+            $start_time=$year.'-'.$month.'-01 00:00:00';
+            $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
-
-        $req['wgjs_rq'] = $req['wgjs_rq'].' 00:00:00';
-        $req['sys_rq'] = date('Y-m-d H:i:s');
-
-        //开启事务
-        db()->startTrans();
-        try{
-            $sql = db()->table('db_wgjs')->fetchSql(true)->insert($req);
-            $res= db()->query($sql);
-            // 提交事务
-            db()->commit();
-        } catch (\Exception $e) {
-            // 回滚事务
-            db()->rollback();
-            $this->error($e->getMessage());
+        $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_wgjs.wgjs_bh1','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+        ->select();
+        $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_wgjs.wgjs_bh2','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+        ->select();
+        $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_wgjs.wgjs_bh3','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+        ->select();
+        $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_wgjs.wgjs_bh4','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+        ->select();
+        $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_wgjs.wgjs_bh5','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
+        ->select();
+        $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_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){
+            if(isset($list[$v['wgjs_rq']][$v['wgjs_bh']])){
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]+=$v['wgjs_js'];
+            }else{
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]=$v['wgjs_js'];
+            }
         }
-
-        if($res===false) $this->error('失败');
-
-        $this->success('成功');
+        foreach($res as &$v){
+            if(isset($list[$v['sczl_rq']][$v['bh']])){
+                $v['计时工资']=$list[$v['sczl_rq']][$v['bh']];
+            }else{
+                $v['计时工资']='';
+            } 
+            $v['部门']=$req['department']; 
+            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
+        }
+        $this->success('成功',$res);
     }
-    /**
-     * 删除
+       /**
+     * 月度计时工资调整
      * @ApiMethod (GET)
-     * @param string $wgjs_rq 日期
-     * @param string $wgjs_bh1 员工编号
-    */
-    public function del(){
+     * @param string $date 年月
+     * @param string $code 员工编号
+     */
+    public function wageAdjustment()
+    {
         //get请求
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-
-        if (!isset($req['wgjs_rq']) || !isset($req['wgjs_bh1']) ){
-            $this->error('参数错误');
-        }else{
+        $res=db()->table('绩效加班工资月度修正')
+            ->field('人事_基本资料.所在部门,bh,rtrim(xm) as xm,月计时时数,DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq,sczl_gdbh,sczl_yjno,sczl_gxh,
+            千件工价,Rate,sum(达标定额) as 达标定额,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,计时冲定额,sum(New_计件工资) as
+            New_计件工资,sum(New_加班工资) as New_加班工资,调整量_合计')
+            ->join('人事_基本资料','人事_基本资料.员工编号=绩效加班工资月度修正.bh','LEFT')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh')
+            ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
+            ->select();
+        if(!$res){
+            $this->error('失败');
         }
-        if (empty($req['wgjs_rq']) || empty($req['wgjs_bh1'])){
-            $this->error('参数不能为空');
+        foreach($res as &$v){
+            if($v['sczl_yjno']>9){
+                $sczl_yjno=$v['sczl_yjno'];
+            }else{
+                $sczl_yjno='0'.$v['sczl_yjno'];
+            }
+            unset($v['sczl_yjno']);
+            if($v['sczl_gxh']>9){
+                $sczl_gxh=$v['sczl_gxh'];
+            }else{
+                $sczl_gxh='0'.$v['sczl_gxh'];
+            }
+            unset($v['sczl_gxh']);
+            $v['sczl_gdbh']=$v['sczl_gdbh'].'-'.$sczl_yjno.'-'.$sczl_gxh;
+            $v['bh']=$v['bh'].' '.$v['xm'];
+            unset($v['xm']); 
         }
-        $rows = db()->table('db_wgjs')->where(['wgjs_rq'=>$req['wgjs_rq'].' 00:00:00','wgjs_bh1'=>$req['wgjs_bh1']])
-        ->delete();
-        if($rows){
-        $this->success('成功');
-        }else{
-            $this->error('失败');
-        }   
+        $this->success('成功',$res);
     }
 }

application/api/controller/RelatedSalaryAccounting.php

@@ -79,14 +79,32 @@ class RelatedSalaryAccounting extends Api
             $start_time=$year.'-'.$month.'-01 00:00:00';
             $end_time=$year.'-'.($month+1).'-01 00:00:00';
         }
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sys_ny'=>$req['date']])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
         $res=db()->table('人事_关联工资设置')
             ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
             ->field('关联员工 as 员工编号,rtrim(人事_基本资料.员工姓名) as 员工姓名,rtrim(人事_基本资料.职称职务) as 职称职务,
             人事_基本资料.所在部门,DATE_FORMAT(日期,"%Y.%m.%d") as 日期,关联系数,count(被关联员工) as 关联人数')
             ->group('LEFT(日期, 10),关联员工')
-            ->where(['日期'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+            ->where(['日期'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>['like',$req['department'].'%']])
             ->order('关联员工,日期')
             ->select();
+        foreach($res as &$v){
+            if(isset($data[$v['员工编号']][$v['日期']])){
+                $v['个人计件工资']=$data[$v['员工编号']][$v['日期']]['个人计件工资'];
+                $v['个人加班工资']=$data[$v['员工编号']][$v['日期']]['个人加班工资'];
+            }else{
+                $v['个人计件工资']='';
+                $v['个人加班工资']='';
+            }
+        }
         if(!$res){
             $this->error('失败');
         }
@@ -105,82 +123,91 @@ class RelatedSalaryAccounting extends Api
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-        $res=db()->table('绩效工资汇总')
-            ->field('bh,xm,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资')
-            // ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.Gd_cpmc) 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')
+        $year=substr($req['date'],0,4);
+        $month=substr($req['date'],-2);
+        if($month==12){
+            $start_time=$year.'-12-01 00:00:00';
+            $end_time=($year+1).'-01-01 00:00:00';
+        }else{
+            $start_time=$year.'-'.$month.'-01 00:00:00';
+            $end_time=$year.'-'.($month+1).'-01 00:00:00';
+        }
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
             ->group('LEFT(sczl_rq, 10),bh')
             ->where(['sys_ny'=>$req['date']])
             ->select();
-            halt($res);
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
+            ->field('DATE_FORMAT(日期,"%Y.%m.%d") as 日期,关联员工 as 员工编号,rtrim(人事_基本资料.员工姓名) as 员工姓名,
+            rtrim(人事_基本资料.职称职务) as 职称职务,人事_基本资料.所在部门,被关联员工,权重')
+            ->group('LEFT(日期, 10),被关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'关联员工'=>$req['code']])
+            ->order('关联员工,日期')
+            ->select();
         if(!$res){
             $this->error('失败');
         }
-        foreach($res as &$v){
-            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
-            if($v['sczl_yjno']>9){
-                $sczl_yjno=$v['sczl_yjno'];
+         foreach($res as &$v){
+            if(isset($data[$v['被关联员工']][$v['日期']])){
+                $v['被关联姓名']=$data[$v['被关联员工']][$v['日期']]['姓名'];
+                $v['个人计件工资']=$data[$v['被关联员工']][$v['日期']]['个人计件工资'];
+                $v['个人加班工资']=$data[$v['被关联员工']][$v['日期']]['个人加班工资'];
             }else{
-                $sczl_yjno='0'.$v['sczl_yjno'];
+                $v['个人计件工资']='';
+                $v['个人加班工资']='';
             }
-            unset($v['sczl_yjno']);
-            if($v['sczl_gxh']>9){
-                $sczl_gxh=$v['sczl_gxh'];
-            }else{
-                $sczl_gxh='0'.$v['sczl_gxh'];
-            }
-            unset($v['sczl_gxh']);
-            $v['sczl_type']=$sczl_yjno.'-'.$sczl_gxh.'-->'.$v['sczl_type'];
         }
         $this->success('成功',$res);
     }
      /**
-     * 计件员工加班费核查详情
+     * 关联工资核算详情
      * @ApiMethod (GET)
      * @param string $date 日期
      * @param string $code 员工编号
      */
     public function getDetail()
     {
-        //get请求
+       //get请求
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
         $start_time=$req['date'].' 00:00:00';
         $end_time=$req['date'].' 23:59:59';
-        $res=db()->table('绩效工资汇总')
-           ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.Gd_cpmc) 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')
-            ->group('LEFT(sczl_rq, 10),sczl_gdbh')
-            ->where(['sczl_rq'=>['between',"$start_time,$end_time"],'bh'=>$req['code']])
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sczl_rq'=>$start_time])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
+            ->field('DATE_FORMAT(日期,"%Y.%m.%d") as 日期,关联员工 as 员工编号,rtrim(人事_基本资料.员工姓名) as 员工姓名,
+            rtrim(人事_基本资料.职称职务) as 职称职务,人事_基本资料.所在部门,被关联员工,权重')
+            ->group('LEFT(日期, 10),被关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'关联员工'=>$req['code']])
+            ->order('关联员工,日期')
             ->select();
         if(!$res){
             $this->error('失败');
         }
-        foreach($res as &$v){
-            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
-            if($v['sczl_yjno']>9){
-                $sczl_yjno=$v['sczl_yjno'];
+         foreach($res as &$v){
+            if(isset($data[$v['被关联员工']][$v['日期']])){
+                $v['被关联姓名']=$data[$v['被关联员工']][$v['日期']]['姓名'];
+                $v['个人计件工资']=$data[$v['被关联员工']][$v['日期']]['个人计件工资'];
+                $v['个人加班工资']=$data[$v['被关联员工']][$v['日期']]['个人加班工资'];
             }else{
-                $sczl_yjno='0'.$v['sczl_yjno'];
+                $v['个人计件工资']='';
+                $v['个人加班工资']='';
             }
-            unset($v['sczl_yjno']);
-            if($v['sczl_gxh']>9){
-                $sczl_gxh=$v['sczl_gxh'];
-            }else{
-                $sczl_gxh='0'.$v['sczl_gxh'];
-            }
-            unset($v['sczl_gxh']);
-            $v['sczl_type']=$sczl_yjno.'-'.$sczl_gxh.'-->'.$v['sczl_type'];
         }
         $this->success('成功',$res);
     }
@@ -189,28 +216,11 @@ class RelatedSalaryAccounting extends Api
      * @ApiMethod GET
     */
     public function search(){
-      
-        //get请求
+      //get请求
         if(!$this->request->isGet()){
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-        $yg = db()->table('人事_基本资料')->where('员工姓名',$req['search'])->value('员工编号');
-        if($yg){
-            $req['search']=$yg;
-        }
-        $res=db()->table('绩效工资汇总')
-            ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
-            ->field('bh,rtrim(xm) as 员工姓名,人事_基本资料.工资表类别,LEFT(人事_基本资料.聘用日期, 10) as 聘用日期,法定天数,
-            sum(日定额) as 当月定额,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
-            sum(个人加班工资) as 个人加班工资,sum(计时补差额工资) as 计时补差,LEFT(sczl_rq, 7) as sczl_rq')
-            ->group('绩效工资汇总.bh')
-            ->where('sys_ny',$req['date'])
-            ->where('bh',$req['search'])
-            ->select();
-        if(!$res){
-            $this->error('失败');
-        }
         $year=substr($req['date'],0,4);
         $month=substr($req['date'],-2);
         if($month==12){
@@ -220,47 +230,424 @@ 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_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_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_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_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_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_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();
-        $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
-        foreach($arr as $v){
-            if(isset($list[$v['wgjs_rq']][$v['wgjs_bh']])){
-                $list[$v['wgjs_rq']][$v['wgjs_bh']]+=$v['wgjs_js'];
+        $gd = db()->table('工单_基本资料')->where('Gd_cpmc',$req['search'])->value('Gd_gdbh');
+        if($gd){
+            $req['search']=$gd;
+        }
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sys_ny'=>$req['date']])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
+            ->field('关联员工 as 员工编号,rtrim(人事_基本资料.员工姓名) as 员工姓名,rtrim(人事_基本资料.职称职务) as 职称职务,
+            人事_基本资料.所在部门,DATE_FORMAT(日期,"%Y.%m.%d") as 日期,关联系数,count(被关联员工) as 关联人数')
+            ->group('LEFT(日期, 10),关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'关联员工'=>$req['search']])
+            ->order('关联员工,日期')
+            ->select();
+        foreach($res as &$v){
+            if(isset($data[$v['员工编号']][$v['日期']])){
+                $v['个人计件工资']=$data[$v['员工编号']][$v['日期']]['个人计件工资'];
+                $v['个人加班工资']=$data[$v['员工编号']][$v['日期']]['个人加班工资'];
             }else{
-                $list[$v['wgjs_rq']][$v['wgjs_bh']]=$v['wgjs_js'];
+                $v['个人计件工资']='';
+                $v['个人加班工资']='';
             }
         }
-        foreach($res as &$v){
-            $v['聘用日期']=str_replace('-','.',$v['聘用日期']);
-            if(isset($list[$v['sczl_rq']][$v['bh']])){
-                $v['月计时时数']=$list[$v['sczl_rq']][$v['bh']];
+        if(!$res){
+            $this->error('失败');
+        }
+        $this->success('成功',$res);
+    }
+     /**
+     * 关联工资设置
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $code 员工编号
+     */
+    public function setting()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sczl_rq'=>$start_time])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
+            ->field('DATE_FORMAT(日期,"%Y.%m.%d") as 日期,关联员工 as 关联人员工号,rtrim(人事_基本资料.员工姓名) as 关联人员姓名,
+            被关联员工 as 班组员工编号,权重 as 组员权重,关联系数 as 日关联系数,人事_关联工资设置.UniqID')
+            ->group('被关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'关联员工'=>$req['code']])
+            ->order('关联员工,日期')
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+         foreach($res as &$v){
+            if(isset($data[$v['班组员工编号']][$v['日期']])){
+                $bh=$v['班组员工编号'];
+                $rq=$v['日期'];
+                $v['班组员工编号']=$bh.'（'.$data[$bh][$rq]['姓名'].'）';
+                $v['计件工资基数']=$data[$bh][$rq]['个人计件工资'];
+                $v['加班工资基数']=$data[$bh][$rq]['个人加班工资'];
+                $v['日关联人数']=count($res);
             }else{
-                $v['月计时时数']='';
-            }  
-            unset($v['sczl_rq']);
+                $v['个人计件工资']='';
+                $v['个人加班工资']='';
+            }
         }
         $this->success('成功',$res);
     }
+      /**
+     * 更新关联系数
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $code 员工编号
+     */
+    public function updateNum()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        // $sql=db()->table('人事_关联工资设置')
+        //     ->where(['日期'=>$start_time,'关联员工'=>$req['code']])
+        //     ->fetchSql(true)
+        //     ->setField('关联系数',$req['num']);
+        // Db::query($sql);
+        $data['mod_rq'] = date('Y-m-d H:i:s');
+        $data['关联系数']=$req['num'];
+        //开启事务
+        db()->startTrans();
+        try{
+            $sql=db()->table('人事_关联工资设置')
+            ->where(['日期'=>$start_time,'关联员工'=>$req['code']])
+            ->fetchSql(true)
+            ->update($data);
+            $res=Db::query($sql);
+            // 提交事务
+            db()->commit();
+        } catch (\Exception $e) {
+            // 回滚事务
+            db()->rollback();
+            $this->error($e->getMessage());
+        }
+
+        if($res===false) $this->error('失败');
+        $this->success('成功');
+    }
+    /**
+     * 关联组员权重查询
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $code 员工编号
+     */
+    public function weightDetail()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $res=db()->table('人事_基本资料')
+            ->join('人事_关联工资设置','人事_基本资料.员工编号=人事_关联工资设置.被关联员工','LEFT')
+            ->join('人事_员工照片','人事_基本资料.照片ID=人事_员工照片.UniqId','LEFT')
+            ->field('人事_关联工资设置.被关联员工 as 员工编号,rtrim(员工姓名) as 姓名,rtrim(所在部门) as 部门名称,人事_基本资料.职称职务 as 职务,
+            DATE_FORMAT(聘用日期,"%Y.%m.%d") as 入职日期,权重 as 关联权重')
+            ->group('被关联员工')
+            ->where(['人事_关联工资设置.日期'=>['between',"$start_time,$end_time"],'人事_关联工资设置.被关联员工'=>$req['code']])
+            ->order('关联员工,日期')
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        $this->success('成功',$res);
+    }
+    /**
+     * 批量附加组员列表
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $code 员工编号
+     */
+    public function batchAddLst()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq,sczl_bzdh')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sczl_rq'=>$start_time])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.被关联员工','LEFT')
+            ->field('DATE_FORMAT(日期,"%Y.%m.%d") as 日期,人事_基本资料.所在部门,人事_基本资料.职称职务,被关联员工 as 班组员工编号,人事_关联工资设置.UniqID')
+            // ->group('被关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'关联员工'=>['NEQ',$req['code']]])
+            ->order('人事_基本资料.所在部门')
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+         foreach($res as &$v){
+            if(isset($data[$v['班组员工编号']][$v['日期']])){
+                $bh=$v['班组员工编号'];
+                $rq=$v['日期'];
+                $v['班组员工编号']=$bh.'（'.$data[$bh][$rq]['姓名'].'）';
+                $v['班组']=$data[$bh][$rq]['sczl_bzdh'];
+                $v['计件工资基数']=$data[$bh][$rq]['个人计件工资'];
+                $v['加班工资基数']=$data[$bh][$rq]['个人加班工资'];
+            }else{
+                $v['计件工资基数']='删除';
+                $v['加班工资基数']='';
+            }
+        }
+        foreach($res as $k=>$v){
+            if($v['计件工资基数']=='删除'){
+                unset($res[$k]);
+            }
+        }
+        array_multisort($res);
+        $this->success('成功',$res);
+    }
+     /**
+     * 批量附加组员定位
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $search 员工编号
+     */
+    public function batchAddSearch()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $gd = db()->table('工单_基本资料')->where('Gd_cpmc',$req['search'])->value('Gd_gdbh');
+        if($gd){
+            $req['search']=$gd;
+        }
+        $gz=db()->table('绩效工资汇总')
+            ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
+            DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq,sczl_bzdh')
+            ->group('LEFT(sczl_rq, 10),bh')
+            ->where(['sczl_rq'=>$start_time])
+            ->select();
+        foreach($gz as $v){
+           $data[$v['bh']][$v['sczl_rq']]=$v;
+        }
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.被关联员工','LEFT')
+            ->field('DATE_FORMAT(日期,"%Y.%m.%d") as 日期,人事_基本资料.所在部门,人事_基本资料.职称职务,被关联员工 as 班组员工编号,人事_关联工资设置.UniqID')
+            // ->group('被关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"],'被关联员工'=>['EQ',$req['search']]])
+            ->order('人事_基本资料.所在部门')
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+         foreach($res as &$v){
+            if(isset($data[$v['班组员工编号']][$v['日期']])){
+                $bh=$v['班组员工编号'];
+                $rq=$v['日期'];
+                $v['班组员工编号']=$bh.'（'.$data[$bh][$rq]['姓名'].'）';
+                $v['班组']=$data[$bh][$rq]['sczl_bzdh'];
+                $v['计件工资基数']=$data[$bh][$rq]['个人计件工资'];
+                $v['加班工资基数']=$data[$bh][$rq]['个人加班工资'];
+            }else{
+                $v['计件工资基数']='删除';
+                $v['加班工资基数']='';
+            }
+        }
+        foreach($res as $k=>$v){
+            if($v['计件工资基数']=='删除'){
+                unset($res[$k]);
+            }
+        }
+        $this->success('成功',$res);
+    }
+     /**
+     * 关联组员复制列表
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     */
+    public function copyLst()
+    {
+       //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $req['date']=str_replace('.','-',$req['date']);
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $res=db()->table('人事_关联工资设置')
+            ->join('人事_基本资料','人事_基本资料.员工编号=人事_关联工资设置.关联员工','LEFT')
+            ->field('关联员工 as 员工编号,人事_基本资料.员工姓名,人事_基本资料.所在部门,人事_基本资料.职称职务,人事_关联工资设置.UniqID')
+            ->group('关联员工')
+            ->where(['日期'=>['between',"$start_time,$end_time"]])
+            // ->order('人事_关联工资设置.关联员工')
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        $this->success('成功',$res);
+    }
+     /**
+     * 批量附加组员
+     * @ApiMethod POST
+     * @params string UniqID
+    */
+    public function batchAdd(){
+        if (Request::instance()->isPost() == false){
+            $this->error('非法请求');
+        }
+        $params = Request::instance()->post();
+
+        if (!isset($params) || !isset($params[0]['UniqID'])){
+            $this->error('参数不能为空');
+        }
+         //开启事务
+         db()->startTrans();
+         try{
+            foreach($params as $k=>$v){
+                $v['mod_rq']=date('Y-m-d H:i:s');
+                $sql=db()->table('人事_关联工资设置')
+                   ->where(['UniqID'=>$v['UniqID']])
+                   ->fetchSql(true)
+                   ->update($v);
+                $res=Db::query($sql);
+            }  
+             // 提交事务
+             db()->commit();
+         } catch (\Exception $e) {
+             // 回滚事务
+             db()->rollback();
+             $this->error($e->getMessage());
+         }
+         if($res===false) $this->error('失败');
+         $this->success('成功');
+    }
+      /**
+     * 批量删除组员
+     * @ApiMethod POST
+     * @params string UniqID
+    */
+    public function batchDel(){
+        if (Request::instance()->isPost() == false){
+            $this->error('非法请求');
+        }
+        $params = Request::instance()->post();
+
+        if (!isset($params) || !isset($params[0]['UniqID'])){
+            $this->error('参数不能为空');
+        }
+         //开启事务
+         db()->startTrans();
+         try{
+            foreach($params as $k=>$v){
+                $v['mod_rq']=date('Y-m-d H:i:s');
+                $v['关联员工']='';
+                $sql=db()->table('人事_关联工资设置')
+                   ->where(['UniqID'=>$v['UniqID']])
+                   ->fetchSql(true)
+                   ->update($v);
+                $res=Db::query($sql);
+            }  
+             // 提交事务
+             db()->commit();
+         } catch (\Exception $e) {
+             // 回滚事务
+             db()->rollback();
+             $this->error($e->getMessage());
+         }
+         if($res===false) $this->error('失败');
+         $this->success('成功');
+    }
+      /**
+     * 关联组员复制
+     * @ApiMethod POST
+     * @params string UniqID
+    */
+    public function copy(){
+        if (Request::instance()->isPost() == false){
+            $this->error('非法请求');
+        }
+        $params = Request::instance()->post();
+
+        if (!isset($params) || !isset($params[0])){
+            $this->error('参数不能为空');
+        }
+         //开启事务
+         db()->startTrans();
+         try{
+            foreach($params as $v){
+                $v['old_time']=str_replace('.','-',$v['old_time']).' 00:00:00';
+                $v['new_time']=str_replace('.','-',$v['new_time']).' 00:00:00';
+                db()->table('人事_关联工资设置')
+                   ->where(['关联员工'=>$v['关联员工'],'日期'=>$v['new_time']])
+                   ->delete();
+                $data=Db::table('人事_关联工资设置')
+                   ->field('日期,关联员工,关联系数,被关联员工,权重,sys_id')
+                   ->where(['关联员工'=>$v['关联员工'],'日期'=>$v['old_time']])
+                   ->select();
+                $id=Db::table('人事_关联工资设置')->order('UniqID desc')->limit(1)->value('UniqID');
+                $i=1;
+                foreach($data as &$value){
+                    $value['日期']=$v['new_time'];
+                    $value['UniqID']=$i+$id;
+                    $value['sys_rq']=date('Y-m-d H:i:s');
+                    $i++;
+                }
+                $sql=db()->table('人事_关联工资设置')
+                   ->fetchSql(true)
+                   ->insertAll($data);
+                $res=Db::query($sql);
+            }  
+             // 提交事务
+             db()->commit();
+         } catch (\Exception $e) {
+             // 回滚事务
+             db()->rollback();
+             $this->error($e->getMessage());
+         }
+         if($res===false) $this->error('失败');
+         $this->success('成功');
+    }
 }