审批记录优化

app/admin/controller/Process.php

@@ -69,13 +69,32 @@ class Process extends BaseController
       if($orderCode==""){
           return error_show(1004,"参数orderCode不能为空");
       }
-    $list = Db::name("action_process")->where(['order_type'=>$process_type,"is_del"=>0,"status"=>1])->order("weight desc,id desc")
-        ->select();
+    $list = Db::name("action_process")
+        ->withoutField('updatetime')//排除更新时间
+        ->where(['order_type'=>$process_type,"is_del"=>0,"status"=>1])
+        ->order("weight desc,id desc")
+        ->select()
+        ->toArray();
+
+      //根据所有的状态，查询对应的操作
+      $order_process_s = array_column($list,'order_process');
+
+      $node= Db::name("process_order")
+          ->where(["order_type"=>$process_type,"order_code"=>$orderCode])
+          ->whereIn('action_process',$order_process_s)
+          ->column('id,action_uid,action_name,addtime','action_process');
+
     $data=[];
     foreach ($list as $value){
-        $node = Db::name("process_order")->where(["order_type"=>$value['order_type'],"action_process"=>$value['order_process'],"order_code"=>$orderCode])->find();
-        $value['action_uid']= isset($node['action_uid']) ? $node['action_uid']:'';
-        $value['action_name']= isset($node['action_name']) ? $node['action_name']:'';
+//        $node = Db::name("process_order")
+//            ->where([
+//                "order_type"=>$value['order_type'],
+//                "action_process"=>$value['order_process'],
+//                "order_code"=>$orderCode])
+//            ->find();
+        $value['action_uid']= isset($node[$value['order_process']]['action_uid']) ? $node[$value['order_process']]['action_uid']:'';
+        $value['action_name']= isset($node[$value['order_process']]['action_name']) ? $node[$value['order_process']]['action_name']:'';
+        $value['addtime']= isset($node[$value['order_process']]['addtime']) ? $node[$value['order_process']]['addtime']:'';
         $data[]=$value;
     }
     return app_show(0,"获取成功",$data);