处理排序

app/AdminAgent/Controllers/WorkorderController.php

@@ -20,6 +20,7 @@ use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Http\Request;
 use App\Traits\ResponseHelper;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 
@@ -32,24 +33,16 @@ class WorkorderController extends AdminController
 		$workorderId = \request('workorder_id',0);
 		$userList = $msgList = [];
 
-		$workorder = WorkorderItem::query()
-			->with(['workorder.point', 'workorder.publisher'])
-			->whereHas('workorder', function ($q) {
-				return $q->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]])
+		$workorder = \App\Models\Workorder::query()
+			->with(['point','publisher'])
+			->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]])
 			->orWhere(function ($query) {
 				$query->where('point_id',Admin::user()->id)
 					->where('point_type',DemandTraits::$col[0]);
 			})
-					->orderByDesc('updated_at');
-			})
-			->groupBy('workorder_id')
 			->orderByDesc('updated_at')
 			->get();
 
-		$workorder = $workorder->map(function ($item, $key) {
-			return $item->workorder;
-		})->all();
-
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
 			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
@@ -272,6 +265,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[0];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 
@@ -295,6 +292,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[0];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 }

app/AdminGuide/Controllers/WorkorderController.php

@@ -33,24 +33,16 @@ class WorkorderController extends AdminController
 		$workorderId = \request('workorder_id',0);
 		$userList = $msgList = [];
 
-		$workorder = WorkorderItem::query()
-			->with(['workorder.point', 'workorder.publisher'])
-			->whereHas('workorder', function ($q) {
-				return $q->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[2]])
+		$workorder = \App\Models\Workorder::query()
+			->with(['point','publisher'])
+			->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[2]])
 			->orWhere(function ($query) {
 				$query->where('point_id',Admin::user()->id)
 					->where('point_type',DemandTraits::$col[2]);
 			})
-					->orderByDesc('updated_at');
-			})
-			->groupBy('workorder_id')
 			->orderByDesc('updated_at')
 			->get();
 
-		$workorder = $workorder->map(function ($item, $key) {
-			return $item->workorder;
-		})->all();
-
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
 			return redirect('/admin-guide/workorder_item?workorder_id='.$workorder[0]->id);
@@ -244,6 +236,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[2];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 
@@ -267,6 +263,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[2];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 }

app/AdminSupplier/Controllers/WorkorderController.php

@@ -32,24 +32,16 @@ class WorkorderController extends AdminController
 		$workorderId = \request('workorder_id',0);
 		$userList = $msgList = [];
 
-		$workorder = WorkorderItem::query()
-			->with(['workorder.point', 'workorder.publisher'])
-			->whereHas('workorder', function ($q) {
-				return $q->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[1]])
+		$workorder = \App\Models\Workorder::query()
+			->with(['point','publisher'])
+			->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[1]])
 			->orWhere(function ($query) {
 				$query->where('point_id',Admin::user()->id)
 					->where('point_type',DemandTraits::$col[1]);
 			})
-					->orderByDesc('updated_at');
-			})
-			->groupBy('workorder_id')
 			->orderByDesc('updated_at')
 			->get();
 
-		$workorder = $workorder->map(function ($item, $key) {
-			return $item->workorder;
-		})->all();
-
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
 			return redirect('/admin-supplier/workorder_item?workorder_id='.$workorder[0]->id);
@@ -245,6 +237,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[1];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 
@@ -268,6 +264,10 @@ class WorkorderController extends AdminController
 		$item->publisher_type = DemandTraits::$col[1];
 		$item->publisher_id = Admin::user()->id;
 		$item->save();
+
+		// 更新一下主表的时间做排序用
+		\App\Models\Workorder::query()->where('id', $item->workorder_id)->update(['updated_at' => $item->updated_at]);
+
 		return $this->jsonSuccess($item);
 	}
 }