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

Lyh server



查看合并请求 !2544

@@ -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 = date('Y-m-d');
+        $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         $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']);
@@ -126,7 +126,7 @@ class TicketCount extends Command
         $manageHrModel = new ManageHr();
         $manageHrModel = new ManageHr();
         $ticketLogModel = new TicketLog();
         $ticketLogModel = new TicketLog();
         $ticketDailyDeptModel = new TicketDailyDeptCount();
         $ticketDailyDeptModel = new TicketDailyDeptCount();
-        $date = date('Y-m-d');
+        $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         foreach ($groupList as $item){
         foreach ($groupList as $item){
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
             $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1],'manage_id');
             $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1],'manage_id');

@@ -44,6 +44,14 @@ class TicketController extends BaseController
      * @time   :2025/8/11 14:24
      * @time   :2025/8/11 14:24
      */
      */
     public function manageTicketCount(){
     public function manageTicketCount(){
-
+        $this->request->validate([
+            'dept_id' => 'required',
+        ],[
+            'dept_id.required' => '技术组id',
+        ]);
+        $this->order = 'ticket_num';
+        $sort = $this->map['sort'] ?? 'desc';
+        $data = $this->logic->getManageTicketCount($this->map,$this->order,$sort);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -50,9 +50,9 @@ class TicketLogic extends BaseLogic
      * @time   :2025/8/11 10:57
      * @time   :2025/8/11 10:57
      */
      */
     public function getDailyTicketCount(){
     public function getDailyTicketCount(){
-        $dailyModel = new TicketDailyCount();
-        $dailyList = $dailyModel->list([],'average_time',['*'],'desc',5);//取最近5条数据
         $date = Carbon::yesterday()->toDateString(); //昨日时间
         $date = Carbon::yesterday()->toDateString(); //昨日时间
+        $dailyModel = new TicketDailyCount();
+        $dailyList = $dailyModel->list(['date'=>$date],'average_time',['*'],'desc',5);//取最近5条数据
         $manageModel  = new TicketDailyManageCount();
         $manageModel  = new TicketDailyManageCount();
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'desc',5);//取最近5条数据
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'desc',5);//取最近5条数据
         $deptModel = new TicketDailyDeptCount();
         $deptModel = new TicketDailyDeptCount();
@@ -61,4 +61,19 @@ class TicketLogic extends BaseLogic
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
+    /**
+     * @remark :根据技术组获取
+     * @name   :getManageTicketCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/11 14:41
+     */
+    public function getManageTicketCount($map,$order = 'ticket_num',$desc = 'desc'){
+        $manageModel  = new TicketDailyManageCount();
+        unset($map['sort']);
+        $map['date'] = Carbon::yesterday()->toDateString();
+        $manageList = $manageModel->list($map,$order,['*'],$desc,['*']);
+        return $this->success($manageList);
+    }
+
 }
 }

@@ -759,6 +759,11 @@ 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 () {