Merge remote-tracking branch 'origin/master' into akun

@@ -32,8 +32,8 @@ class SyncTimeFiles extends Command
     {
     {
         $fileModel = new File();
         $fileModel = new File();
 //        $imagesModel = new Image();
 //        $imagesModel = new Image();
-        $start = '2025-08-20 00:00:00';
-        $end = '2025-08-28 00:00:00';
+        $start = '2025-08-28 00:00:00';
+        $end = '2025-08-29 59:00:00';
         $lists = $fileModel->list(['created_at'=>['between',[$start,$end]]]);
         $lists = $fileModel->list(['created_at'=>['between',[$start,$end]]]);
         foreach ($lists as $v){
         foreach ($lists as $v){
             $path = $v['path'];
             $path = $v['path'];

@@ -8,6 +8,7 @@ use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
+use App\Models\Manage\Manage;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\TicketProject;
@@ -142,7 +143,11 @@ class AsideTicketController extends BaseController
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
         $lists = $query->paginate($this->row, ['*'], 'page', $this->page)->toArray();
         $lists = $query->paginate($this->row, ['*'], 'page', $this->page)->toArray();
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
+            $manageModel = new Manage();
             foreach ($lists['list'] as $key => $item){
             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){
                 if($item['status'] == 0){
                     $end = date('Y-m-d H:i:s');
                     $end = date('Y-m-d H:i:s');