|
|
@@ -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)
|