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

gx



查看合并请求 !2545

@@ -72,7 +72,7 @@ class TicketCount extends Command
     public function manage_action(){
     public function manage_action(){
         $manageHrModel = new ManageHr();
         $manageHrModel = new ManageHr();
         $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
         $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
-        $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
+        $date = Carbon::yesterday()->toDateString(); // 昨日时间
         $ticketManageCountModel = new TicketDailyManageCount();
         $ticketManageCountModel = new TicketDailyManageCount();
         foreach ($manageList as $item){
         foreach ($manageList as $item){
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);

@@ -7,12 +7,11 @@
  * @time   :2025/8/11 10:46
  * @time   :2025/8/11 10:46
  */
  */
 
 
-namespace App\Http\Controllers\Bside\Ticket;
+namespace App\Http\Controllers\Aside\Ticket;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Ticket\TicketLogic;
 use App\Http\Logic\Bside\Ticket\TicketLogic;
-use App\Models\WorkOrder\Tickets;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 class TicketController extends BaseController
 class TicketController extends BaseController

@@ -632,7 +632,11 @@ Route::middleware(['aloginauth'])->group(function () {
         // 流量统计
         // 流量统计
         Route::any('/flow', [Aside\Project\StatisticsController::class, 'flow'])->name('admin.statistics_flow');
         Route::any('/flow', [Aside\Project\StatisticsController::class, 'flow'])->name('admin.statistics_flow');
     });
     });
-
+    //ticket
+    Route::prefix('ticket_count')->group(function () {
+        Route::any('/ticketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'ticketCount'])->name('ticket_count_ticketCount');
+        Route::any('/manageTicketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'manageTicketCount'])->name('ticket_count_manageTicketCount');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组

@@ -759,11 +759,6 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/countQuantity', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'countQuantity'])->name('geo_result_countQuantity');//geo统计
         Route::any('/countQuantity', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'countQuantity'])->name('geo_result_countQuantity');//geo统计
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
     });
     });
-    //ticket
-    Route::prefix('ticket_count')->group(function () {
-        Route::any('/ticketCount', [\App\Http\Controllers\Bside\Ticket\TicketController::class,'ticketCount'])->name('ticket_count_ticketCount');
-        Route::any('/manageTicketCount', [\App\Http\Controllers\Bside\Ticket\TicketController::class,'manageTicketCount'])->name('ticket_count_manageTicketCount');
-    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {