周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 887d12414914c4f08372896b026f03391ce4ed7a 2 个父辈 f8c7f064 f526565a

合并分支 'lyh-server' 到 'master' 

超过120小时未处理的工单



查看合并请求 !2697
内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 115 行删除
... ... @@ -22,12 +22,12 @@ class AsideTicketController extends BaseController
*
* @return \Illuminate\Http\Response
*/
public function lists(AsideTicketListRequest $request)
public function index(AsideTicketListRequest $request)
{
$validated = $request->validated();
$query = Tickets::with([
'logs.engineer',
'project.pm',
'project.pm:',
'project.projectV6',
])
->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
... ... @@ -142,119 +142,6 @@ class AsideTicketController extends BaseController
$this->response('success', Code::SUCCESS, $lists);
}
/**
* @remark :列表
* @name :index
* @author :lyh
* @method :post
* @time :2025/9/1 17:47
*/
public function index(AsideTicketListRequest $request)
{
$validated = $request->validated();
// 1️⃣ 先构建主表查询（只查票据ID用于分页）
$ticketQuery = Tickets::query()
->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
$engineerId = $validated['engineer_id'];
return $query->where(function ($q) use ($engineerId) {
$q->where('submit_user_id', $engineerId)
->orWhereHas('logs', function ($q1) use ($engineerId) {
$q1->where('engineer_id', $engineerId);
});
});
})
->when($request->input('project_id') !== null, function ($query) use ($request) {
$projectId = $request->input('project_id');
return $query->whereHas('project', function ($q) use ($projectId) {
$q->where('uuid', $projectId);
});
})
->when($request->input('status') !== null, function ($query) use ($request) {
$status = $request->input('status');
if($status == '-1'){
$newTime = now()->subHours(120);
return $query->where('status', 0)->where('plan_end_at', '<', $newTime);
} else {
return $query->where('status', $status);
}
})
->when($request->input('timeout') !== null, function ($query) use ($request) {
$timeout = $request->input('timeout');
switch ($timeout) {
case 1: $newTime = now()->subHours(24); break;
case 2: $newTime = now()->subHours(48); break;
case 3: $newTime = now()->subHours(72); break;
default: $newTime = now(); break;
}
return $query->where('status', 0)->where('plan_end_at','<',$newTime);
})
->when($request->input('star') !== null, function ($query) use ($request) {
return $query->where('star', $request->input('star'));
})
->when($request->input('search'), function ($query) use ($request) {
$search = $request->input('search');
return $query->where(function ($q) use ($search) {
$q->where('title', 'like', "%{$search}%")
->orWhereHas('project', function ($q1) use ($search) {
$q1->where('title', 'like', "%{$search}%")
->orWhere('company_name', 'like', "%{$search}%");
});
});
})
->when($request->input('project_status') !== null, function ($query) use ($request) {
return $query->whereHas('project', function ($q) use ($request) {
$q->where('status', $request->input('project_status'));
});
})
->when($request->input('project_cate') !== null, function ($query) use ($request) {
return $query->whereHas('project', function ($q) use ($request) {
$q->where('project_cate', $request->input('project_cate'));
});
});
// 部门筛选
if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
$manageIdArr = (new ManageHr())->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
$ticketQuery->whereHas('logs', function ($q) use ($manageIdArr) {
$q->whereIn('engineer_id', $manageIdArr);
});
}
// 时间区间筛选
if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
$ticketQuery->whereBetween('created_at', [$this->param['start_at'], $this->param['end_at']]);
}
// 排序
$sortField = $request->input('sort_field', 'plan_end_at');
$sortOrder = strtolower($request->input('sort_order', 'asc'));
$ticketQuery->orderBy('status', 'asc')
->orderBy($sortField, $sortOrder);
if ($sortField != 'plan_end_at') $ticketQuery->orderBy('plan_end_at', 'asc');
// 2️⃣ 分页只获取主表ID
$page = $this->page;
$row = $this->row;
$ticketIds = $ticketQuery->clone()->paginate($row, ['id'], 'page', $page);
// 3️⃣ 批量加载关联表
$lists = Tickets::with([
'logs.engineer',
'project.pm',
'project.projectV6'
])->whereIn('id', $ticketIds->pluck('id'))->get();
// 4️⃣ 计算 plan_ent_time
$lists->transform(function($item){
if($item->status == 0 && $item->plan_end_at && $item->plan_end_at < now()){
$item->plan_ent_time = diffInHours($item->plan_end_at, now());
}
return $item;
});
$this->response('success', Code::SUCCESS, [
'current_page' => $page,
'last_page' => $ticketIds->lastPage(),
'total' => $ticketIds->total(),
'list' => $lists
]);
}
/**
* @param $search
... ...