瀏覽代碼

修改OrderIssueFilters

ajun 5 年之前
父節點
當前提交
6303f9b927
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 6 3
      app/Filters/OrderIssueFilters.php
  2. 0 1
      app/Http/Controllers/OrderIssueController.php

+ 6 - 3
app/Filters/OrderIssueFilters.php

@@ -158,7 +158,10 @@ class OrderIssueFilters
         if(empty($this->params['hidden_tag']))
             $this->queryBuilder->whereNull('order_issues.hidden_tag');
 
-        if(!($this->params['is_handle'] ?? false) && !($this->params['final_status'] ?? false)){
+        if(isset($this->params['data'])){
+            $ids = explode(',',$this->params['data']);
+            $this->id($ids);
+        }elseif(!($this->params['is_handle'] ?? false) && !($this->params['final_status'] ?? false)){
             if(!(isset($this->params['settlement_at_start']) || isset($this->params['settlement_at_end']))) {
                 $this->queryBuilder->where(function ($query) {
                     $query->whereNotIn('order_issues.final_status', ['已解决', '已归档'])->orWhereNull('order_issues.final_status');
@@ -226,7 +229,7 @@ class OrderIssueFilters
 
     public function log_content($log_content)
     {
-        $order_issue_process_log_query = OrderIssueProcessLog::query()->selectRaw('order_issue_id')->where('log_content','like','$log_content');
+        $order_issue_process_log_query = OrderIssueProcessLog::query()->selectRaw('order_issue_id')->where('content','like',$log_content);
         if(!$this->params['addtime']){
             $order_issue_process_log_query->where('created_at', '>=', Carbon::now()->subDays(31));
         }else{
@@ -307,7 +310,7 @@ class OrderIssueFilters
 
     public function id($id)
     {
-        $this->searchWay($this->queryBuilder,$id,'order_issues.id');
+        $this->queryBuilder->whereIn('order_issues.id',$id);
     }
 
     public function created_at_start($created_at_start)

+ 0 - 1
app/Http/Controllers/OrderIssueController.php

@@ -42,7 +42,6 @@ class OrderIssueController extends Controller
         $orderIssueService = app('OrderIssueService');
         $owners = app(OwnerService::class)->getAuthorizedOwners();
         $orderIssues = OrderIssue::query()->filter($filter)->defaultWith()->paginate($request['paginate'] ?? 50);
-//        $orderIssues = $orderIssueService->paginate($request->all());
         $orderIssueType = OrderIssueType::all();
         $qualityLabel = QualityLabel::all();
         $logistics = Logistic::all();