gx

@@ -89,7 +89,7 @@ class TicketController extends BaseController
             'start.required' => 'start不能为空',
             'end.required' => 'end不能为空',
         ]);
-        $data = $this->logic->getWeekManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1);
+        $data = $this->logic->getWeekManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1,$this->order);
         $this->response('success',Code::SUCCESS,$data);
     }
 
@@ -108,7 +108,7 @@ class TicketController extends BaseController
             'start.required' => 'start不能为空',
             'end.required' => 'end不能为空',
         ]);
-        $data = $this->logic->getMonthManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1);
+        $data = $this->logic->getMonthManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1,$this->order);
         $this->response('success',Code::SUCCESS,$data);
     }
 

@@ -121,13 +121,13 @@ class TicketLogic extends BaseLogic
      * @method :post
      * @time   :2025/8/30 16:02
      */
-    public function getWeekManageList($start,$end,$dept_id = 1){
+    public function getWeekManageList($start,$end,$dept_id = 1,$order = 'complete_num'){
         if(empty($start) || empty($end)){
             $start = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
             $end = Carbon::now()->subWeek()->endOfWeek();   // 上周日 23:59:59
         }
         $manageWeekModel = new TicketWeekManageCount();
-        $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
+        $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id],$order);
         $deptWeekModel = new TicketWeekDeptCount();
         $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
         return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList ?? []]);
@@ -140,13 +140,13 @@ class TicketLogic extends BaseLogic
      * @method :post
      * @time   :2025/8/30 16:27
      */
-    public function getMonthManageList($start,$end,$dept_id){
+    public function getMonthManageList($start,$end,$dept_id = 1,$order = 'complete_num'){
         if(empty($start) || empty($end)){
             $start = Carbon::now()->subMonth()->startOfMonth(); // 上个月 1号 00:00:00
             $end = Carbon::now()->subMonth()->endOfMonth();   // 上个月最后一天 23:59:59
         }
         $manageWeekModel = new TicketMonthManageCount();
-        $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
+        $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id],$order);
         $deptWeekModel = new TicketMonthDeptCount();
         $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
         return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);