提交

application/api/controller/Approve.php

@@ -4,8 +4,6 @@ namespace app\api\controller;
 
 use app\common\service\ApproveService;
 use hg\apidoc\annotation as Apidoc;
-use think\Db;
-use think\Exception;
 
 /**
  * @Apidoc\Title("审批")
@@ -65,7 +63,8 @@ class Approve extends Base
         $search = input('search');
         $offset = $this->off_set;
         $length = $this->page_num;
-        $data = ApproveService::get_list($status, $module, $start_time, $end_time, $search, $offset, $length, $this->user);
+        $user = $this->user;
+        $data = ApproveService::get_list($status, $module, $start_time, $end_time, $search, $offset, $length, $user);
         $this->success('审批列表', $data);
     }
 
@@ -80,7 +79,8 @@ class Approve extends Base
     public function get_detail()
     {
         $id = input('approve_id');
-        $info = ApproveService::get_detail($id, $this->user, 'detail');
+        $user = $this->user;
+        $info = ApproveService::get_detail($id, $user, 'detail');
         $this->success('详情', $info);
     }
 
@@ -96,7 +96,8 @@ class Approve extends Base
     public function get_info()
     {
         $id = input('approve_id');
-        $info = ApproveService::get_detail($id, $this->user, 'info');
+        $user = $this->user;
+        $info = ApproveService::get_detail($id, $user, 'info');
         $this->success('信息', $info);
     }
 

application/api/controller/Approveflow.php

@@ -41,7 +41,8 @@ class Approveflow extends Base
     {
         $module = input('module');
         $flow_item = input('flow_item');
-        $data = ApproveFlowService::get_data($module, $flow_item,$this->user);
+        $user = $this->user;
+        $data = ApproveFlowService::get_data($module, $flow_item,$user);
         $this->success('获取审批流程', $data);
     }
 

application/api/controller/Approveinfo.php

@@ -114,8 +114,8 @@ class Approveinfo extends Base
         $copy_user = input('copy_user');
         $apply_goods = input('apply_goods');
         $peer_user = input('peer_user');
-        $user = $this->user;
         $params = compact("way","id", "module", "reason", "type", "desc", "start_time", "end_time", "document", "images", "remark", "total_amount", "pay_type", "word_size", "number", "is_who", "start_am", "end_am", "time", "reach_address", "end_address", "scope", "legal_opinion", "founder", "serial_number", "apply_date", "degree", "department", "department_sign", "approve_user", "copy_user", "apply_goods", "peer_user");
+        $user = $this->user;
         if($way == CommonConstant::edit){
             ApproveService::make($id, $params, $user, CommonConstant::edit);
             $this->success('修改成功');

application/common/model/Goods.php

@@ -2,7 +2,6 @@
 
 namespace app\common\model;
 
-use app\common\constant\CommonConstant;
 use think\Model;
 
 /**

application/common/model/GoodsSku.php

@@ -2,7 +2,6 @@
 
 namespace app\common\model;
 
-use app\common\constant\CommonConstant;
 use think\Model;
 
 /**

application/common/model/GoodsSkuValue.php

@@ -2,7 +2,6 @@
 
 namespace app\common\model;
 
-use app\common\constant\CommonConstant;
 use think\Model;
 
 /**

application/common/service/ApproveInfoService.php

@@ -333,7 +333,7 @@ class ApproveInfoService
             }
             if ($goods_name) {
                 // 商品库选择的商品 在商品库没有匹配到 返回错误提示
-                except($goods_name . '等在商品库里不存在或已删除');
+                except($goods_name . '等商品在商品库里不存在或已删除');
             }
             if ($goods_stock_name) {
                 // 商品库选择的商品的规格 在商品库没有匹配到 返回错误提示
@@ -505,7 +505,7 @@ class ApproveInfoService
         }
 
         $userid = $user['userid'];
-        $list = ApproveInfo::field('module,module_id,user_id,is_deleted', true)
+        $list = ApproveInfo::field('module_id,user_id,department,is_deleted', true)
             ->where('module', $module)
             ->where('user_id', $userid)
             ->where('status', $status)
@@ -514,8 +514,8 @@ class ApproveInfoService
                 $query->where('order_no|reason', 'like', '%' . $search . '%');
             });
         $list = self::get_with($list, $module, $status);
-        $list = $list->limit($offset, $length)
-            ->order('id desc')
+        $list = $list->order('id desc')
+            ->limit($offset, $length)
             ->select();
         return $list;
     }

application/common/service/ApproveService.php

@@ -2,8 +2,11 @@
 
 namespace app\common\service;
 
+use app\common\constant\ApplyConstant;
 use app\common\constant\CommonConstant;
+use app\common\model\ApplyGoods;
 use app\common\model\Approve;
+use app\common\model\ApproveEvectionPeerUser;
 use app\common\model\ApproveInfo;
 use app\common\model\User;
 use think\Db;
@@ -38,8 +41,9 @@ class ApproveService
                 ->where('module', 'in', $modules)
                 ->where('status', CommonConstant::STATUS_2)
                 ->group('module')
-                ->select();
-            $object = $list ? array_column($list->toArray(), null, 'module') : [];
+                ->select()
+                ->toArray();
+            $object = $list ? array_column($list, null, 'module') : [];
         }
 
         $data = [];
@@ -142,9 +146,69 @@ class ApproveService
                 }
             ]);
         }
-        $list = $list->limit($offset, $length)
-            ->order('approve_id desc')
+        $list = $list->order('approve_id desc')
+            ->limit($offset, $length)
             ->select();
+        return self::get_array($list);
+    }
+
+    public static function get_array($list)
+    {
+        $apply_goods_info_ids = [];
+        $peer_user_info_ids = [];
+        $apply_goods_list = [];
+        $peer_user_list = [];
+        foreach ($list as $value) {
+            $module = $value['module'];
+            switch ($module) {
+                case CommonConstant::MODULE_1:
+                    if ($value['type'] == ApplyConstant::TYPE_1) {
+                        $apply_goods_info_ids[] = $value['info_id'];
+                    }
+                    break;
+                case CommonConstant::MODULE_5:
+                    $peer_user_info_ids[] = $value['info_id'];
+                    break;
+            }
+        }
+        if ($apply_goods_info_ids) {
+            $apply_goods_list = ApplyGoods::field('id,info_id,goods_name')
+                ->where('info_id', 'in', $apply_goods_info_ids)
+                ->select()
+                ->toArray();
+        }
+        if ($peer_user_info_ids) {
+            $peer_user_list = ApproveEvectionPeerUser::field('id,info_id,name')
+                ->where('info_id', 'in', $peer_user_info_ids)
+                ->select()
+                ->toArray();
+        }
+        foreach ($list as $value) {
+            $module = $value['module'];
+            $apply_goods = [];
+            $peer_user = [];
+            switch ($module) {
+                case CommonConstant::MODULE_1:
+                    if ($value['type'] == ApplyConstant::TYPE_1) {
+                        foreach ($apply_goods_list as $val) {
+                            if ($value['info_id'] == $val['info_id']) {
+                                $apply_goods[] = $val;
+                            }
+                        }
+                    }
+                    break;
+                case CommonConstant::MODULE_5:
+                    foreach ($peer_user_list as $val) {
+                        if ($value['info_id'] == $val['info_id']) {
+                            $peer_user[] = $val;
+                        }
+                    }
+                    break;
+            }
+            $value['apply_goods'] = $apply_goods;
+            $value['peer_user'] = $peer_user;
+        }
+        return $list;
 
 //        $info_ids = [];
 //        foreach ($list as $value){
@@ -168,8 +232,6 @@ class ApproveService
 //                }
 //            }
 //        }
-
-        return $list;
     }
 
     /**