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

Lyh server



查看合并请求 !3254

@@ -85,4 +85,22 @@ class TicketUploadDataController extends BaseController
         $data = $this->logic->saveData();
         $data = $this->logic->saveData();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :删除数据
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/14 11:05
+     */
+    public function del()
+    {
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => '主键ID不能为空',
+        ]);
+        $data = $this->logic->delData();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -118,7 +118,7 @@ class AsideTicketController extends BaseController
                     $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
                     $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
                 }
                 }
                 $query->whereHas('logs', function ($q) use ($manageIdArr) {
                 $query->whereHas('logs', function ($q) use ($manageIdArr) {
-                    $q->whereIn('engineer_id', $manageIdArr);
+                    $q->whereIn('engineer_id', $manageIdArr)->where('is_engineer',1);
                 });
                 });
             }else{
             }else{
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');

@@ -397,4 +397,17 @@ class TicketUploadDataLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :删除
+     * @name   :delData
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/14 11:04
+     */
+    public function delData()
+    {
+        $this->model->del(['id'=>['in',$this->param['id']]]);
+        return $this->success();
+    }
 }
 }

@@ -680,6 +680,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/', [Aside\Ticket\TicketUploadDataController::class,'lists'])->name('ticket_upload_lists');
         Route::any('/', [Aside\Ticket\TicketUploadDataController::class,'lists'])->name('ticket_upload_lists');
         Route::any('/save', [Aside\Ticket\TicketUploadDataController::class,'save'])->name('ticket_upload_save');
         Route::any('/save', [Aside\Ticket\TicketUploadDataController::class,'save'])->name('ticket_upload_save');
         Route::any('/detail', [Aside\Ticket\TicketUploadDataController::class,'detail'])->name('ticket_upload_detail');
         Route::any('/detail', [Aside\Ticket\TicketUploadDataController::class,'detail'])->name('ticket_upload_detail');
+        Route::any('/del', [Aside\Ticket\TicketUploadDataController::class,'del'])->name('ticket_upload_del');
     });
     });
     //岗位管理
     //岗位管理
     Route::prefix('entry_position')->group(function () {
     Route::prefix('entry_position')->group(function () {