1

app/Http/Controllers/Api/OaController.php

@@ -294,6 +294,19 @@ class OaController extends BaseController
         }
     }
 
+    public function reportList(Request $request){
+
+        $service = new OaService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->reportList($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
 
     public function oaGetTeamDetail(Request $request){
 

app/Http/Controllers/Api/TestController.php

@@ -9,6 +9,7 @@ use App\Service\EmployeeService;
 use App\Service\MeasureService;
 use App\Service\OperationLogService;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 
 
 class TestController extends BaseController
@@ -24,36 +25,11 @@ class TestController extends BaseController
     }
 
     public function aa(){
-        $a = new OperationLogService();
-//        $a = $a->getOperationList(['order_number'=>'T9XS.202402281513167014']);
-//        var_dump($a);die;
-        $checkResult = EmployeeService::checkUser(1);
-        list($state, $data) = $checkResult;
-        $user['id'] = 1;
-        $data['role'] = EmployeeService::getPersonRole(1);
-        $return = EmployeeService::getLoginDepart(1);
-        //所属部门
-        $data['rule_depart'] = $return[0] ?? [];
-        //顶级公司
-        $data['depart_top'] = $return[1] ?? [];
-        //部门对应的顶级公司
-        $data['depart_map'] = $return[2] ?? [];
-        //权限范围内的部门以及公司
-        $data['depart_range'] = $return[3] ?? [];
-        //是否有所有的部门权限
-        $data['is_all_depart'] = $return[4] ?? 0;
-        //总公司
-        $data['head'] = $return[5] ?? [];
-        //是否是总公司下的人
-        $data['is_behind_main'] = $return[6] ?? 0;
-        //是否库存校验
-        $data['is_check_stock'] = true;
-
-        //写入user信息
-        $user = $data;
-
-        $data = json_decode('{"id":94,"sales_order_type":1,"model_type":1,"order_number":"T9XS.202402281811376059","title":null,"selling_price":"0.00","vin_no":null,"order_type":168,"deal_type":176,"customer_id":17,"sign_time":1708473600,"contract_state":178,"product_total":"40959.00","rate":"100.00","crt_id":1,"del_time":0,"crt_time":"2024-02-28 18:12:08","upd_time":"1709115128","mark":null,"construction_time":1708963200,"handover_time":1707421600,"expire_time":1708493600,"other_fee":0,"discount_fee":0,"contract_fee":"40959.00","contract_type":null,"pay_way":null,"send_state":null,"logistics_company":null,"logistics_number":null,"car_type":null,"year":null,"mileage":null,"color":null,"original_set":null,"processing":null,"state":0,"dispatch_time_first":null,"dispatch_time_second":null,"customer_title":"\u5185\u6d4b2","sales_order_type_title":"\u5b89\u88c5\u4ef6","dispatch_depart_two":[],"dispatch_employee":[],"dispatch_depart_one":[],"product":[{"product_id":48,"code":"333","number":"123","bar_code":"333","title":"333","size":"333","depart_price":"333.00","sports_bag_id":0,"_X_ROW_KEY":"row_803","cost":"333.00","basic_type_id":0,"retail_price":"333.00","final_amount":"40959.00","price":"333.00"}],"employee_three":[50],"employee_two":[52],"employee_one":[52],"file":[],"activity_product":[],"order_type_title":"\u603b\u90e8\u65bd\u5de5","deal_type_title":"\u5f53\u65e5\u6210\u4ea4","contract_state_title":"\u7b7e\u7ea6","contract_type_title":null,"car_type_title":null,"pay_way_title":null,"send_state_title":null,"logistics_company_title":null,"crt_name":"\u8d85\u7ea7\u7ba1\u7406\u5458","return_exchange":[],"importance":null,"employee_one_title":"\u5185\u6d4b\u9ad8\u5065","employee_two_title":"\u5185\u6d4b\u9ad8\u5065","employee_three_title":"\u5185\u6d4b\u590f\u793c\u68ee","menu_id":"37"}',true);
-        $a->setOperationList($data,$user,2,37);
+        $text = '这是测试';
+        $key = '72f8c912d462b1md034ff46cbedaskc80bf';
+        $sign = Hash::make($text.$key);
+        var_dump(Hash::check('这是测试'.'72f8c912d462b1md034ff46cbedaskc80bf',$sign));
+        var_dump($sign);die;
     }
 
 

app/Model/OaReportOrder.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ *
+ * Class Unit
+ * @package App\Models
+ */
+class OaReportOrder extends Model
+{
+    protected $table = "oa_report_order"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+
+}

app/Model/OaReportOrderEmployee.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ *
+ * Class Unit
+ * @package App\Models
+ */
+class OaReportOrderEmployee extends Model
+{
+    protected $table = "oa_report_order_employee"; //指定表
+    const CREATED_AT = null;
+    const UPDATED_AT = null;
+    protected $dateFormat = 'U';
+
+}

app/Model/OaSubReportEmployee.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ *
+ * Class Unit
+ * @package App\Models
+ */
+class OaSubReportEmployee extends Model
+{
+    protected $table = "oa_sub_report_employee"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+
+}

app/Service/OaService.php

@@ -12,8 +12,11 @@ use App\Model\Oa;
 use App\Model\OaOrder;
 use App\Model\OaOrderSub;
 use App\Model\OaOrderSubEmployee;
+use App\Model\OaReportOrder;
+use App\Model\OaReportOrderEmployee;
 use App\Model\OaSub;
 use App\Model\OaSubEmployee;
+use App\Model\OaSubReportEmployee;
 use App\Model\OaSubRule;
 use App\Model\RollFilm;
 use App\Model\RollFilmCombine;
@@ -53,51 +56,63 @@ class OaService extends Service
     {
 
         $id = $data['id'];
-        $menu_id = Oa::where('id',$id)->value('menu_id');
-        $list = OaSub::where('oa_id',$id)->where('del_time',0)->get()->toArray();
+        $oa = Oa::where('id', $id)->first();
+        $list = OaSub::where('oa_id', $id)->where('del_time', 0)->get()->toArray();
         $oa_sub_ids = [];
-        foreach ($list as $v){
+        foreach ($list as $v) {
             $oa_sub_ids[] = $v['id'];
         }
-        $oaRule = OaSubRule::wherein('oa_sub_id',$oa_sub_ids)->get()->toArray();
-        $oaEmployee = OaSubEmployee::wherein('oa_sub_id',$oa_sub_ids)->get()->toArray();
+        $oaRule = OaSubRule::wherein('oa_sub_id', $oa_sub_ids)->get()->toArray();
+        $oaEmployee = OaSubEmployee::wherein('oa_sub_id', $oa_sub_ids)->get()->toArray();
+        $oaReportEmployee = OaSubReportEmployee::wherein('oa_sub_id', $oa_sub_ids)->get()->toArray();
         $oaRuleKey = [];
         $oaEmployeeKey = [];
-        foreach ($oaRule as $v){
+        $oaReportEmployeeKey = [];
+        foreach ($oaRule as $v) {
             $oaRuleKey[$v['oa_sub_id']][] = [
                 'value' => $v['value'],
                 'key' => $v['key'],
-                'opera' => $v['formula'] == '==' ? '=' : $v['formula'] ,
+                'opera' => $v['formula'] == '==' ? '=' : $v['formula'],
             ];
         }
-        $employee_key_list = Employee::pluck('emp_name','id')->toArray();
-        foreach ($oaEmployee as $v){
+        $employee_key_list = Employee::pluck('emp_name', 'id')->toArray();
+        foreach ($oaEmployee as $v) {
             $oaEmployeeKey[$v['oa_sub_id']][] = [
-                'id'=>$v['employee_id'],
-                'emp_name'=>$employee_key_list[$v['employee_id']],
+                'id' => $v['employee_id'],
+                'emp_name' => $employee_key_list[$v['employee_id']],
+            ];
+        }
+        foreach ($oaReportEmployee as $v) {
+            $oaReportEmployeeKey[$v['oa_sub_id']][] = [
+                'id' => $v['employee_id'],
+                'emp_name' => $employee_key_list[$v['employee_id']],
             ];
         }
         $return = [];
-        foreach ($list as $v){
+        foreach ($list as $v) {
             $return[$v['sort']][] = [
                 'emp_id' => $oaEmployeeKey[$v['id']],
+                'copy_id' => $oaReportEmployeeKey[$v['id']] ?? [],
+                'is_copy' => isset($oaReportEmployeeKey[$v['id']]) && !empty($oaReportEmployeeKey[$v['id']]),
                 'index' => $v['h5_key'],
-                'set' => isset($oaRuleKey[$v['id']])?$oaRuleKey[$v['id']] : [] ,
+                'set' => isset($oaRuleKey[$v['id']]) ? $oaRuleKey[$v['id']] : [],
             ];
         }
         $detail = [];
-        foreach ($return as $k=>$v){
+        foreach ($return as $k => $v) {
             $children = [];
-            foreach ($v as $vv){
+            foreach ($v as $vv) {
                 $children[] = [
-                    'set'=>$vv['set'],
-                    'emp_id'=>$vv['emp_id'],
-                    'index'=>$vv['index'],
+                    'set' => $vv['set'],
+                    'emp_id' => $vv['emp_id'],
+                    'copy_id' => $vv['copy_id'],
+                    'is_copy' => $vv['is_copy'],
+                    'index' => $vv['index'],
                 ];
             }
-            $detail[] = ['children'=>$children];
+            $detail[] = ['children' => $children];
         }
-        return [true, ['data'=>$detail,'menu_id'=>$menu_id]];
+        return [true, ['data' => $detail, 'menu_id' => $oa->menu_id, 'title' => $oa->title]];
 
     }
 
@@ -173,6 +188,7 @@ class OaService extends Service
             DB::beginTransaction();
             $oa->menu_id = $data['menu_id'];
             $oa->type = $data['type'];
+            $oa->title = $data['title'] ?? '';
             $oa->save();
             $id = $oa->id;
             $insert = [];
@@ -203,12 +219,12 @@ class OaService extends Service
     }
 
 
-    public function oaEdit($data,$user)
+    public function oaEdit($data, $user)
     {
 
 
         $first = Oa::where('del_time', 0)->where('menu_id', $data['menu_id']);
-        if(isset($data['id'])) $first = $first->where('id', '<>', $data['id']);
+        if (isset($data['id'])) $first = $first->where('id', '<>', $data['id']);
         if (isset($data['type'])) $first = $first->where('type', $data['type']);
         $first = $first->first();
 
@@ -217,101 +233,119 @@ class OaService extends Service
 
         try {
             DB::beginTransaction();
-            if(isset($data['id'])) $oa = Oa::where('id', $data['id'])->first();
+            if (isset($data['id'])) $oa = Oa::where('id', $data['id'])->first();
             else $oa = new Oa();
             $oa->menu_id = $data['menu_id'];
             $oa->crt_employee_id = $user['id'];
-            $oa->type = $data['type']??0;
+            $oa->type = $data['type'] ?? 0;
+            $oa->title = $data['title'] ?? '';
             $oa->save();
             $id = $oa->id;
             $insert = [];
+
+            $oa_sub_id = OaSub::where('oa_id', $id)->pluck('id')->toArray();
             OaSub::where('oa_id', $id)->update([
                 'del_time' => time()
             ]);
             //处理前端数据
-            $this->dealOaData($data,$id);
+            $this->dealOaData($data, $id, $oa_sub_id);
             DB::commit();
         } catch (\Exception $e) {
             DB::rollBack();
-            return [false, $e->getLine().$e->getMessage()];
+            return [false, $e->getLine() . $e->getMessage()];
         }
 
         return [true, '更新成功'];
     }
 
-    public function dealOaData($data,$id){
+    public function dealOaData($data, $id, $oa_sub_id)
+    {
         $data = $data['approval'];
         $detail = [];
         $sort = 0;
-        foreach ($data as $v){
+        foreach ($data as $v) {
             $sort++;
-            foreach ($v['children'] as $vv){
+            foreach ($v['children'] as $vv) {
                 $detail[] = [
                     'h5_key' => $vv['index'],
                     'emp_id' => $vv['emp_id'],
+                    'copy_id' => $vv['copy_id'] ?? [],
                     'set' => $vv['set'],
                     'sort' => $sort,
                 ];
             }
         }
         $oa_subs = [];
-        foreach ($detail as $v){
+        foreach ($detail as $v) {
             $oa_subs[] = [
-                'crt_time'=>time(),
-                'upd_time'=>time(),
-                'sort'=>$v['sort'],
-                'sub_id'=>-1,
-                'remark'=>'',
-                'oa_id'=>$id,
-                'type'=>1,
-                'parent_id'=>0,
-                'h5_key'=>$v['h5_key'],
+                'crt_time' => time(),
+                'upd_time' => time(),
+                'sort' => $v['sort'],
+                'sub_id' => -1,
+                'remark' => '',
+                'oa_id' => $id,
+                'type' => 1,
+                'parent_id' => 0,
+                'h5_key' => $v['h5_key'],
             ];
         }
         OaSub::insert($oa_subs);
-        $oa_sub = OaSub::where('oa_id',$id)->get()->toArray();
+        $oa_sub = OaSub::where('oa_id', $id)->get()->toArray();
         $list_key = [];
-        foreach ($oa_sub as $v){
+        foreach ($oa_sub as $v) {
             $list_key[$v['h5_key']] = $v;
         }
-        foreach ($list_key as $k=>$v){
-            if($v['sort'] == 1) continue;
+        foreach ($list_key as $k => $v) {
+            if ($v['sort'] == 1) continue;
             $len = strlen($k);
-            foreach ($list_key as $kk=>$vv){
-                if(strlen($kk) == ($len-2) && substr($k,0,$len-2) == $kk){
+            foreach ($list_key as $kk => $vv) {
+                if (strlen($kk) == ($len - 2) && substr($k, 0, $len - 2) == $kk) {
                     $list_key[$k]['parent_id'] = $vv['id'];
                 }
             }
         }
         $employee_list = [];
         $set_list = [];
-        foreach ($detail as $v){
-            foreach ($v['emp_id'] as $vv){
+        $report_list = [];
+        foreach ($detail as $v) {
+            if (isset($v['copy_id'])) {
+                foreach ($v['copy_id'] as $vv) {
+                    $report_list[] = [
+                        'employee_id' => $vv,
+                        'oa_sub_id' => $list_key[$v['h5_key']]['id'],
+                    ];
+                }
+            }
+
+            foreach ($v['emp_id'] as $vv) {
                 $employee_list[] = [
                     'employee_id' => $vv,
                     'oa_sub_id' => $list_key[$v['h5_key']]['id'],
-            ];
+                ];
             }
             $n = 1;
-            foreach ($v['set'] as $vv){
-                if($vv['opera'] == '=') $v['opera'] = '==';
-                if($n > 1) $right_formula = '&&';
+            foreach ($v['set'] as $vv) {
+                if ($vv['opera'] == '=') $v['opera'] = '==';
+                if ($n > 1) $right_formula = '&&';
                 else $right_formula = '';
                 $set_list[] = [
-                    'oa_sub_id'=>$list_key[$v['h5_key']]['id'],
-                    'key'=>$vv['key'],
-                    'value'=>$vv['value'],
-                    'sort'=>$n,
-                    'formula'=>$vv['opera'],
-                    'right_formula'=>$right_formula,
+                    'oa_sub_id' => $list_key[$v['h5_key']]['id'],
+                    'key' => $vv['key'],
+                    'value' => $vv['value'],
+                    'sort' => $n,
+                    'formula' => $vv['opera'],
+                    'right_formula' => $right_formula,
                 ];
                 $n++;
             }
         }
+        OaSubRule::where('oa_sub_id', $oa_sub_id)->delete();
+        OaSubEmployee::where('oa_sub_id', $oa_sub_id)->delete();
         OaSubRule::insert($set_list);
         OaSubEmployee::insert($employee_list);
-        foreach ($list_key as $v){
-            if($v['parent_id'] > 0 ) OaSub::where('id',$v['id'])->update([
+        if (!empty($report_list)) OaSubReportEmployee::insert($report_list);
+        foreach ($list_key as $v) {
+            if ($v['parent_id'] > 0) OaSub::where('id', $v['id'])->update([
                 'parent_id' => $v['parent_id']
             ]);
         }
@@ -353,7 +387,7 @@ class OaService extends Service
 
 //        $crt_id = request()->userData->id;
         Log::channel('request')->info('request', ['param' => $data]);
-        if(!isset($data['order_number'])) $data['order_number'] = $data['order_no'];
+        if (!isset($data['order_number'])) $data['order_number'] = $data['order_no'];
         $orderObject = $data['order_number'];
         $menu_id = $data['menu_id'];
         $order_no = $data['order_number'];
@@ -363,22 +397,23 @@ class OaService extends Service
         $list = Oa::from('oa as o')
             ->leftJoin('oa_sub as os', 'os.oa_id', 'o.id')
             ->select('os.sort', 'os.type', 'os.sub_id')
+            ->where('o.del_time', 0)
             ->where('o.menu_id', $menu_id);
         if (!empty($type)) $list = $list->where('os.sort', 1);
         $list = $list->orderBy('os.sort')
             ->get()->toArray();
-        if(empty($list)) {
-            $this->returnOa($order_no,1,$type);
-            return [200,''];
+        if (empty($list)) {
+            $this->returnOa($order_no, 1, $type);
+            return [200, ''];
         }
         try {
             DB::beginTransaction();
 
-            list($employee_ids,$oa_sub_id) = $this->oaCommon($menu_id,['order_number'=>$orderObject],1);
-            if(empty($employee_ids)){
-                $this->returnOa($order_no,1,$type);
+            list($employee_ids, $oa_sub_id) = $this->oaCommon($menu_id, ['order_number' => $orderObject], 1);
+            if (empty($employee_ids)) {
+                $this->returnOa($order_no, 1, $type);
                 DB::commit();
-                return [true,'审核成功'];
+                return [true, '审核成功'];
             }
             $order = new OaOrder();
             $order->menu_id = $menu_id;
@@ -397,7 +432,7 @@ class OaService extends Service
             $oa_order_sub_id = $oa_order_sub->id;
 
             $insert = [];
-            foreach ($employee_ids as $employee_id){
+            foreach ($employee_ids as $employee_id) {
                 $insert[] = [
                     'oa_order_id' => $id,
                     'oa_order_sub_id' => $oa_order_sub_id,
@@ -409,87 +444,89 @@ class OaService extends Service
             return [true, '']; //success
         } catch (\Exception $e) {
             DB::rollBack();
-            $this->returnOa($order_no,2,$type);
-            return [false, $e->getLine().':'.$e->getMessage()];
+            $this->returnOa($order_no, 2, $type);
+            return [false, $e->getLine() . ':' . $e->getMessage()];
         }
 
 
     }
 
 
-    public function oaCommon($menu_id, $param, $sort = 1,$parent_id = 0)
+    public function oaCommon($menu_id, $param, $sort = 1, $parent_id = 0)
     {
-        $request =  request();
-        foreach ($param as $k=>$v){
+        $request = request();
+        foreach ($param as $k => $v) {
             $request->$k = $v;
         }
         $all = $request->all();
-        if(!isset($all['order_number']))  $request->merge($param);
+        if (!isset($all['order_number'])) $request->merge($param);
 //        $request->merge($param);
-        $detail = $this->oaGetData($menu_id,$request);
-        $oa_id = Oa::where('menu_id',$menu_id)->value('id');
-        $parent_ids = [$parent_id,0];
+        $detail = $this->oaGetData($menu_id, $request);
+        $oa_id = Oa::where('menu_id', $menu_id)->where('del_time', 0)->value('id');
+        $parent_ids = [$parent_id, 0];
 //        var_dump($parent_ids);
-        if($sort>2) {
+        if ($sort > 2) {
             $sorts = $sort - 1;
-            $oa_sub_ids = OaSub::where('sort','<',$sorts)->wherein('parent_id',$parent_ids)->pluck('id')->toArray();
+            $oa_sub_ids = OaSub::where('sort', '<', $sorts)->where('del_time', 0)->wherein('parent_id', $parent_ids)->pluck('id')->toArray();
 //            var_dump($oa_sub_ids);die;
-            $parent_ids = array_merge($parent_ids,$oa_sub_ids);
+            $parent_ids = array_merge($parent_ids, $oa_sub_ids);
         }
-        $list = OaSub::where('oa_id',$oa_id)->where('sort',$sort)->wherein('parent_id',$parent_ids);
+        $list = OaSub::where('oa_id', $oa_id)->where('del_time', 0)->where('sort', $sort)->wherein('parent_id', $parent_ids);
         $list = $list->select('*')->get()->toArray();
 //        dd($list);
-        if(empty($list)) return [[],''];
+        if (empty($list)) return [[], ''];
         $oa_sub_ids = [];
         $oa_sub_key = [];
-        foreach ($list as $v){
+        foreach ($list as $v) {
             $oa_sub_ids[] = $v['id'];
             $oa_sub_key[$v['id']] = $v;
             $rule_key_list[$v['id']] = [];
         }
-        $rule_list = OaSubRule::wherein('oa_sub_id',$oa_sub_ids)->select('*')->get()->toArray();
+        $rule_list = OaSubRule::wherein('oa_sub_id', $oa_sub_ids)->select('*')->get()->toArray();
 
-        foreach ($rule_list as $v){
+        foreach ($rule_list as $v) {
             $rule_key_list[$v['oa_sub_id']][] = $v;
         }
 
         //规则开始判断
         $employee_ids = [];
         $oa_sub_id = 0;
-        foreach ($rule_key_list as $k=>$v){
-
-            $status = $this->formulaRule($v,$detail);
-            if($status){
-                if($oa_sub_key[$k]['type'] == 2){
-                    $employee_ids = EmployeeTeamPermission::where('team_id',$oa_sub_key[$k]['sub_id'])->pluck('employee_id')->toArray();
-                }else{
+        foreach ($rule_key_list as $k => $v) {
+
+            $status = $this->formulaRule($v, $detail);
+            if ($status) {
+                if ($oa_sub_key[$k]['type'] == 2 && $oa_sub_key[$k]['sub_id'] > 0) {
+                    $employee_ids = EmployeeTeamPermission::where('team_id', $oa_sub_key[$k]['sub_id'])->pluck('employee_id')->toArray();
+                } elseif ($oa_sub_key[$k]['sub_id'] == -1) {
+                    $employee_ids = OaSubEmployee::where('oa_sub_id', $oa_sub_key[$k]['id'])->pluck('employee_id')->toArray();
+                } else {
                     $employee_ids[] = [$oa_sub_key[$k]['sub_id']];
                 }
                 $oa_sub_id = $k;
                 continue;
             }
         }
-        return [$employee_ids,$oa_sub_id];
+        return [$employee_ids, $oa_sub_id];
     }
 
-    public function formulaRule($params,$detail){
+    public function formulaRule($params, $detail)
+    {
         $rule = '';
 //        dd($params);
-        if(empty($params)) return true;
-        foreach ($params as $param){
-            if(!$param['key']) continue;
-            if(!empty($param['right_formula'])) $rule .= ' '.$param['right_formula'].' ';
-            $rule .= '"'.$detail[$param['key']].'"'.' '.$param['formula'] .' '.'"'.$param['value'].'"';
+        if (empty($params)) return true;
+        foreach ($params as $param) {
+            if (!$param['key']) continue;
+            if (!empty($param['right_formula'])) $rule .= ' ' . $param['right_formula'] . ' ';
+            $rule .= '"' . $detail[$param['key']] . '"' . ' ' . $param['formula'] . ' ' . '"' . $param['value'] . '"';
 
         }
 //        dd($rule);
-        if(empty($rule)) return true;
+        if (empty($rule)) return true;
 //        var_dump($rule);
-        if(eval("return  $rule;")) {
+        if (eval("return  $rule;")) {
 //            var_dump($rule);die;
             return true;
-        }
-        else return false;
+        } else return false;
     }
 
 
@@ -499,22 +536,22 @@ class OaService extends Service
 //        $user_id = '482';
         $id = $data['id'];
         $state = $data['state'];
-        if($state == 0) $state = 2;
+        if ($state == 0) $state = 2;
         $remark = $data['remark'];
         $detail = OaOrderSub::from('oa_order_sub as s')
-            ->leftJoin('oa_order_sub_employee as e','e.oa_order_sub_id','s.id')
-            ->where('e.employee_id',$user_id)->where('s.state',0)
-            ->where('s.id',$id)
-            ->select('s.oa_order_id','sort','oa_sub_id')->first();
-        if(empty($detail)) return [false,'没有审核权限'];
+            ->leftJoin('oa_order_sub_employee as e', 'e.oa_order_sub_id', 's.id')
+            ->where('e.employee_id', $user_id)->where('s.state', 0)
+            ->where('s.id', $id)
+            ->select('s.oa_order_id', 'sort', 'oa_sub_id', 's.id')->first();
+        if (empty($detail)) return [false, '没有审核权限'];
         $detail = $detail->toArray();
-        $oaOrder = OaOrder::where('id',$detail['oa_order_id'])->first();
+        $oaOrder = OaOrder::where('id', $detail['oa_order_id'])->first();
         try {
             DB::beginTransaction();
             switch ($state) {
                 case 1:
                     $sort = $detail['sort'] + 1;
-                    list($employee_ids,$oa_sub_id) = $this->oaCommon($oaOrder->menu_id, ['order_number' => $oaOrder->order_no], $sort,$detail['oa_sub_id']);
+                    list($employee_ids, $oa_sub_id) = $this->oaCommon($oaOrder->menu_id, ['order_number' => $oaOrder->order_no], $sort, $detail['oa_sub_id']);
 //                    var_dump($employee_ids);
 //                    var_dump($oa_sub_id);die;
                     if (empty($employee_ids)) {
@@ -561,16 +598,39 @@ class OaService extends Service
                 'state' => $state,
                 'remark' => $remark,
             ]);
+            $this->report($oaOrder, $detail['oa_sub_id']);
             DB::commit();
-            return [true,'操作成功！'];
+            return [true, '操作成功！'];
         } catch (\Exception $e) {
             DB::rollBack();
-            return [false, $e->getLine().':'.$e->getMessage()];
+            return [false, $e->getLine() . ':' . $e->getMessage()];
+        }
+    }
+
+
+    public function report($oaOrder, $oa_sub_id)
+    {
+        $oa_sub_report_employee = OaSubReportEmployee::where('oa_sub_id', $oa_sub_id)->select('*')->get()->toArray();
+        if (!empty($oa_sub_report_employee)) {
+            $list = [];
+            $report = new OaReportOrder();
+            $report->menu_id = $oaOrder->menu_id;
+            $report->order_no = $oaOrder->order_no;
+            $report->opt_case = $oaOrder->opt_case;
+            $report->save();
+            foreach ($oa_sub_report_employee as $v) {
+                $list[] = [
+                    'employee_id' => $v['employee_id'],
+                    'oa_report_order_id' => $report->id,
+                ];
+            }
         }
+        OaReportOrderEmployee::insert($list);
     }
 
 
-    public function returnOa($order_no,$type,$opt_case){
+    public function returnOa($order_no, $type, $opt_case)
+    {
         $service = new CheckService();
         $service->createRecordAndInventory([
             'order_number' => $order_no,
@@ -580,11 +640,11 @@ class OaService extends Service
     }
 
 
-    public function oaGetData($menu_id,$request)
+    public function oaGetData($menu_id, $request)
     {
-        $api = SysMenu::where('id',$menu_id)->value('api');
+        $api = SysMenu::where('id', $menu_id)->value('api');
         $path = $this->getMenu();
-        $control = '\\'.$path[$api]["controller"];
+        $control = '\\' . $path[$api]["controller"];
         $act = $path[$api]["act"];
         $new = new $control();
         $detail = $new->$act($request);
@@ -592,14 +652,15 @@ class OaService extends Service
         return $detail['data']['data'][0];
     }
 
-    public function getMenu(){
+    public function getMenu()
+    {
         $app = App();
         $routes = $app->routes->getRoutes();
         $path = [];
         foreach ($routes as $k => $value) {
-            if(!isset($value->action['controller'])) continue;
-            $act = explode('@',$value->action['controller']);
-            if(!isset($act[1])) continue;
+            if (!isset($value->action['controller'])) continue;
+            $act = explode('@', $value->action['controller']);
+            if (!isset($act[1])) continue;
             $path[$value->uri]['act'] = $act[1];
             $path[$value->uri]['controller'] = $act[0];
         }
@@ -607,34 +668,37 @@ class OaService extends Service
         return $path;
     }
 
-    public function oaOrderList($data){
+    public function oaOrderList($data)
+    {
         $order_no = $data['order_no'];
         $menu_id = $data['menu_id'];
-        $oa = OaOrder::where('order_no',$order_no)->where('menu_id',$menu_id)->first();
-        if(empty($oa)) return [false,'审核不存在'];
-        $list = OaOrderSub::where('oa_order_id',$oa->id)->orderBy('sort','asc')->select('*')->get()->toArray();
-        return [true,$list];
+        $oa = OaOrder::where('order_no', $order_no)->where('menu_id', $menu_id)->first();
+        if (empty($oa)) return [false, '审核不存在'];
+        $list = OaOrderSub::where('oa_order_id', $oa->id)->orderBy('sort', 'asc')->select('*')->get()->toArray();
+        return [true, $list];
     }
 
 
-    public function oaOrderState($data,$user){
+    public function oaOrderState($data, $user)
+    {
         $user_id = $user->id;
         $order_no = $data['order_no'];
         $menu_id = $data['menu_id'];
-        $detail = OaOrder::where('order_no',$order_no)->orderBy('id','desc')->where('menu_id',$menu_id)->first();
-        if(empty($detail)) return [false,'审核不存在'];
-        if($detail->state == 2) return [true,['state'=>0]];
-        $oa_detail = OaOrderSubEmployee::where('employee_id',$user_id)->where('oa_order_id',$detail->id)->pluck('oa_order_sub_id')->toArray();
-        if(empty($oa_detail)) return [true ,['state'=>0]];
-        $state = OaOrderSub::wherein('id',$oa_detail)->where('state','<>',2)->orderBy('sort','desc')->first();
-        if(in_array($state->state,[0,2])) return [true,['state'=> 1,'id'=>$state->id]];
+        $detail = OaOrder::where('order_no', $order_no)->orderBy('id', 'desc')->where('menu_id', $menu_id)->first();
+        if (empty($detail)) return [false, '审核不存在'];
+        if ($detail->state == 2) return [true, ['state' => 0]];
+        $oa_detail = OaOrderSubEmployee::where('employee_id', $user_id)->where('oa_order_id', $detail->id)->pluck('oa_order_sub_id')->toArray();
+        if (empty($oa_detail)) return [true, ['state' => 0]];
+        $state = OaOrderSub::wherein('id', $oa_detail)->where('state', '<>', 2)->orderBy('sort', 'desc')->first();
+        if (in_array($state->state, [0, 2])) return [true, ['state' => 1, 'id' => $state->id]];
 
-        return [true,['state'=> 0]];
+        return [true, ['state' => 0]];
 
 
     }
 
-    public function checkAllOver($data){
+    public function checkAllOver($data)
+    {
         $order_no = $data['order_number'];
         $menu_id = $data['menu_id'];
         $op_case = $data['opt_case'];
@@ -645,84 +709,106 @@ class OaService extends Service
 //        ]);
 //        $oaOrder->state = 1;
 //        $oaOrder->save();
-        $this->returnOa($order_no,3,$op_case);
-        return [true,'弃审成功'];
+        $this->returnOa($order_no, 3, $op_case);
+        return [true, '弃审成功'];
 
     }
 
 
-    public function oaCheckMove($data,$user_id){
+    public function oaCheckMove($data, $user_id)
+    {
         $id = $data['id'];
         $employee_id = $data['employee_id'];
-        if(empty($employee_id)) return [false,'用户不存在'];
-        $oaOrderSub = OaOrderSub::where('id',$id)->first();
-        OaOrderSubEmployee::where('oa_order_sub_id',$oaOrderSub->id)->delete();
+        if (empty($employee_id)) return [false, '用户不存在'];
+        $oaOrderSub = OaOrderSub::where('id', $id)->first();
+        OaOrderSubEmployee::where('oa_order_sub_id', $oaOrderSub->id)->delete();
         $add = [
             'oa_order_id' => $oaOrderSub->oa_order_id,
             'oa_order_sub_id' => $oaOrderSub->id,
             'employee_id' => $employee_id
         ];
-        $oaOrder = OaOrder::where('id',$oaOrderSub->oa_order_id)->first();
+        $oaOrder = OaOrder::where('id', $oaOrderSub->oa_order_id)->first();
         OaOrderSubEmployee::insert($add);
-        Construction::where('order_number',$oaOrder->order_no)->update([
+        Construction::where('order_number', $oaOrder->order_no)->update([
             'is_transfer' => 1
         ]);
 //        $this->returnOa($order_no,3,$op_case);
-        return [true,'转签成功'];
+        return [true, '转签成功'];
 
     }
-    public function oaSubUserDetail($data){
+
+    public function oaSubUserDetail($data)
+    {
         $order_no = $data['order_no'];
-        $first = OaOrder::where('order_no',$order_no)->first();
-        if(empty($first)) return [true,[]];
+        $first = OaOrder::where('order_no', $order_no)->first();
+        if (empty($first)) return [true, []];
         $oa_order_id = $first->id;
-        $oa_order_sub_id = OaOrderSub::where('oa_order_id',$oa_order_id)->orderBy('sort','desc')->value('id');
-        $employee_list = Employee::pluck('emp_name','id')->toArray();
-        $oa_order_sub_employee_ids = OaOrderSubEmployee::where('oa_order_sub_id',$oa_order_sub_id)->pluck('employee_id')->toArray();
+        $oa_order_sub_id = OaOrderSub::where('oa_order_id', $oa_order_id)->orderBy('sort', 'desc')->value('id');
+        $employee_list = Employee::pluck('emp_name', 'id')->toArray();
+        $oa_order_sub_employee_ids = OaOrderSubEmployee::where('oa_order_sub_id', $oa_order_sub_id)->pluck('employee_id')->toArray();
         $list = [];
-        foreach ($oa_order_sub_employee_ids as $v){
+        foreach ($oa_order_sub_employee_ids as $v) {
             $list[] = $employee_list[$v];
         }
-//        $this->returnOa($order_no,3,$op_case);
-        return [true,$list];
+        return [true, $list];
 
     }
 
-    public function oaGetTeamDetail($data){
+    public function oaGetTeamDetail($data)
+    {
         $order_no = $data['order_no'];
-        $oa_order_id = OaOrder::where('order_no',$order_no)->pluck('id')->toArray();
-        if(empty($oa_order_id)) return [true,[]];
+        $oa_order_id = OaOrder::where('order_no', $order_no)->pluck('id')->toArray();
+        if (empty($oa_order_id)) return [true, []];
 //        $oa_order_id = $first->id;
-        $list = OaOrderSub::wherein('oa_order_id',$oa_order_id)->select('*')->orderBy('id','asc')->get()->toArray();
-        $team_key_list = Team::pluck('title','id')->toArray();
-        $oa_sub_ids = [];
-        foreach ($list as $v){
-            $oa_sub_ids[] = $v['oa_sub_id'];
+        $list = OaOrderSub::wherein('oa_order_id', $oa_order_id)->select('*')->orderBy('id', 'asc')->get()->toArray();
+
+        $subEmployeeList = OaOrderSubEmployee::wherein('oa_order_id', $oa_order_id)->select('*')->get()->toArray();
+        $emp_id_key_list = [];
+        $employee_key_list = Employee::pluck('emp_name', 'id')->toArray();
+        foreach ($subEmployeeList as $v) {
+            $emp_id_key_list[$v['oa_order_sub_id']][] = [
+                'id' => $v['employee_id'],
+                'emp_name' => $employee_key_list[$v['employee_id']] ?? '',
+            ];
         }
-        $team_ids = OaSub::wherein('id',$oa_sub_ids)->pluck('sub_id','id')->toArray();
         $return = [];
-        foreach ($list as $v){
+        foreach ($list as $v) {
             $return[] = [
                 'sort' => $v['sort'],
-                'team' => $team_key_list[$team_ids[$v['oa_sub_id']]],
-                'remark' => $v['remark']?? '',
+                'team' => $emp_id_key_list[$v['id']],
+                'remark' => $v['remark'] ?? '',
                 'state' => $v['state'],
             ];
         }
 //        $this->returnOa($order_no,3,$op_case);
-        return [true,$return];
+        return [true, $return];
 
     }
 
-    public function oaSubRemark($data){
+    public function oaSubRemark($data)
+    {
         $order_no = $data['order_no'];
-        $first = OaOrder::where('del_time',0)->where('order_no',$order_no)->orderBy('id','desc')->first();
-        if(empty($first)) return [true,[]];
+        $first = OaOrder::where('del_time', 0)->where('order_no', $order_no)->orderBy('id', 'desc')->first();
+        if (empty($first)) return [true, []];
         $oa_order_id = $first->id;
-        $remark = OaOrderSub::where('oa_order_id',$oa_order_id)->orderBy('sort','desc')->value('remark');
+        $remark = OaOrderSub::where('oa_order_id', $oa_order_id)->orderBy('sort', 'desc')->value('remark');
 
 //        $this->returnOa($order_no,3,$op_case);
-        return [true,$remark];
+        return [true, $remark];
+
+    }
+
+    public function reportList($data, $user)
+    {
+        $id = $user['id'];
+        $list = OaReportOrder::from('oa_report_order_employee as e')
+            ->leftJoin('oa_report_order as o','o.id','e.oa_report_order_id')
+            ->leftJoin('oa_order as oo','oo.order_no','o.order_no')
+            ->where('e.employee_id',$id)->groupBy('oo.id')->orderBy('oo.id','desc')
+            ->select('oo.*');
+        $list = $this->limit($list,'',$data);
+
+        return [true,$list];
 
     }
 }

routes/api.php

@@ -41,6 +41,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('oaCheckMove', 'Api\OaController@oaCheckMove');
     $route->any('oaSubUserDetail', 'Api\OaController@oaSubUserDetail');
     $route->any('oaSubRemark', 'Api\OaController@oaSubRemark');
+    $route->any('reportList', 'Api\OaController@reportList');
     //审批流参数
     $route->any('oaParamGet','Api\OaController@oaParamGet');