正在显示
1 个修改的文件
包含
21 行增加
和
5 行删除
| @@ -109,15 +109,31 @@ class AsideTicketController extends BaseController | @@ -109,15 +109,31 @@ class AsideTicketController extends BaseController | ||
| 109 | //TODO::用户部门搜索 | 109 | //TODO::用户部门搜索 |
| 110 | if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){ | 110 | if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){ |
| 111 | $manageHrModel = new ManageHr(); | 111 | $manageHrModel = new ManageHr(); |
| 112 | - $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id'); | ||
| 113 | - $query->whereHas('logs', function ($q) use ($manageIdArr) { | ||
| 114 | - $q->whereIn('engineer_id', $manageIdArr); | ||
| 115 | - }); | 112 | + //售后优化+技术搜索 |
| 113 | + if($this->param['dept_id'] == 2 && !empty($this->param['entry_position'])) {//售后部 | ||
| 114 | + if ($this->param['entry_position'] == 1) { | ||
| 115 | + $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [44, 46, 49]], 'status' => 1], 'manage_id'); | ||
| 116 | + } else { | ||
| 117 | + //售后技术 | ||
| 118 | + $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id'); | ||
| 119 | + } | ||
| 120 | + $query->whereHas('logs', function ($q) use ($manageIdArr) { | ||
| 121 | + $q->whereIn('engineer_id', $manageIdArr); | ||
| 122 | + }); | ||
| 123 | + }else{ | ||
| 124 | + $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id'); | ||
| 125 | + $query->whereHas('logs', function ($q) use ($manageIdArr) { | ||
| 126 | + $q->whereIn('engineer_id', $manageIdArr); | ||
| 127 | + }); | ||
| 128 | + } | ||
| 116 | } | 129 | } |
| 117 | if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){ | 130 | if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){ |
| 118 | return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]); | 131 | return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]); |
| 119 | } | 132 | } |
| 120 | - | 133 | + //搜索提交人姓名 |
| 134 | + if(!empty($this->param['submit_username'])){ | ||
| 135 | + return $query->where('submit_username','%'.$this->param['submit_username'].'%'); | ||
| 136 | + } | ||
| 121 | // 添加排序功能 | 137 | // 添加排序功能 |
| 122 | $query->orderBy('status', 'asc'); | 138 | $query->orderBy('status', 'asc'); |
| 123 | // $query->orderBy('id', 'desc'); | 139 | // $query->orderBy('id', 'desc'); |
-
请 注册 或 登录 后发表评论