作者 李宇航

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

Lyh server



查看合并请求 !3213
@@ -133,7 +133,7 @@ class Ticket5UploadDataController extends BaseController @@ -133,7 +133,7 @@ class Ticket5UploadDataController extends BaseController
133 * @method :post 133 * @method :post
134 * @time :2025/11/10 11:01 134 * @time :2025/11/10 11:01
135 */ 135 */
136 - public function save() 136 + public function save5Data()
137 { 137 {
138 $this->request->validate([ 138 $this->request->validate([
139 'post_id' => 'required', 139 'post_id' => 'required',
@@ -184,9 +184,9 @@ class Ticket5UploadDataController extends BaseController @@ -184,9 +184,9 @@ class Ticket5UploadDataController extends BaseController
184 public function pushTicketByBots($post_id,$type = 1) 184 public function pushTicketByBots($post_id,$type = 1)
185 { 185 {
186 $project = TicketProject::where('post_id', $post_id)->where('project_cate',$type)->where('is_del', 0)->first(); 186 $project = TicketProject::where('post_id', $post_id)->where('project_cate',$type)->where('is_del', 0)->first();
187 - if (!$project){  
188 - return response()->json(['message' => '未找到对应的工单项目'], 404); 187 + if ($project){
  188 + return $project->pushWechatGroupMsg("您好,用户已上传数据,请审核!");
189 } 189 }
190 - return $project->pushWechatGroupMsg("您好,用户已上传数据,请审核!"); 190 + return true;
191 } 191 }
192 } 192 }
@@ -112,7 +112,7 @@ Route::prefix('ticket_upload')->group(function () { @@ -112,7 +112,7 @@ Route::prefix('ticket_upload')->group(function () {
112 //5.0获取分类 112 //5.0获取分类
113 Route::any('/getProject5Cate', [\App\Http\Controllers\Api\WorkOrder\Ticket5UploadDataController::class, 'getProject5Cate'])->name('ticket_upload.getProject5Cate'); 113 Route::any('/getProject5Cate', [\App\Http\Controllers\Api\WorkOrder\Ticket5UploadDataController::class, 'getProject5Cate'])->name('ticket_upload.getProject5Cate');
114 Route::any('/addProject5Cate', [\App\Http\Controllers\Api\WorkOrder\Ticket5UploadDataController::class, 'addProject5Cate'])->name('ticket_upload.addProject5Cate'); 114 Route::any('/addProject5Cate', [\App\Http\Controllers\Api\WorkOrder\Ticket5UploadDataController::class, 'addProject5Cate'])->name('ticket_upload.addProject5Cate');
115 - 115 + Route::any('/save5Data', [\App\Http\Controllers\Api\WorkOrder\Ticket5UploadDataController::class, 'save5Data'])->name('ticket_upload.save5Data');
116 }); 116 });
117 //geo设置 117 //geo设置
118 Route::prefix('geo')->group(function () { 118 Route::prefix('geo')->group(function () {