|
...
|
...
|
@@ -8,6 +8,7 @@ use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest; |
|
|
|
use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
|
|
|
|
use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
|
|
|
|
use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
|
|
|
|
use App\Models\Manage\Manage;
|
|
|
|
use App\Models\Manage\ManageHr;
|
|
|
|
use App\Models\WorkOrder\TicketLog;
|
|
|
|
use App\Models\WorkOrder\TicketProject;
|
|
...
|
...
|
@@ -142,7 +143,11 @@ class AsideTicketController extends BaseController |
|
|
|
if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
|
|
|
|
$lists = $query->paginate($this->row, ['*'], 'page', $this->page)->toArray();
|
|
|
|
if(!empty($lists) && !empty($lists['list'])){
|
|
|
|
$manageModel = new Manage();
|
|
|
|
foreach ($lists['list'] as $key => $item){
|
|
|
|
if($item['project']['version'] != 5){
|
|
|
|
$item['project_id']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
|
|
|
|
}
|
|
|
|
//计算超时多少个小时
|
|
|
|
if($item['status'] == 0){
|
|
|
|
$end = date('Y-m-d H:i:s');
|
...
|
...
|
|
