周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 13e9ba440416254d0830bf16f78da85b18ea053c 2 个父辈 37bf8f4c b9fe4b76

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 2 个修改的文件 包含 6 行增加 和 6 行删除
@@ -89,7 +89,7 @@ class TicketController extends BaseController @@ -89,7 +89,7 @@ class TicketController extends BaseController
89 'start.required' => 'start不能为空', 89 'start.required' => 'start不能为空',
90 'end.required' => 'end不能为空', 90 'end.required' => 'end不能为空',
91 ]); 91 ]);
92 - $data = $this->logic->getWeekManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1); 92 + $data = $this->logic->getWeekManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1,$this->order,$this->param['sort'] ?? 'desc');
93 $this->response('success',Code::SUCCESS,$data); 93 $this->response('success',Code::SUCCESS,$data);
94 } 94 }
95 95
@@ -108,7 +108,7 @@ class TicketController extends BaseController @@ -108,7 +108,7 @@ class TicketController extends BaseController
108 'start.required' => 'start不能为空', 108 'start.required' => 'start不能为空',
109 'end.required' => 'end不能为空', 109 'end.required' => 'end不能为空',
110 ]); 110 ]);
111 - $data = $this->logic->getMonthManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1); 111 + $data = $this->logic->getMonthManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1,$this->order,$this->param['sort'] ?? 'desc');
112 $this->response('success',Code::SUCCESS,$data); 112 $this->response('success',Code::SUCCESS,$data);
113 } 113 }
114 114
@@ -121,13 +121,13 @@ class TicketLogic extends BaseLogic @@ -121,13 +121,13 @@ class TicketLogic extends BaseLogic
121 * @method :post 121 * @method :post
122 * @time :2025/8/30 16:02 122 * @time :2025/8/30 16:02
123 */ 123 */
124 - public function getWeekManageList($start,$end,$dept_id = 1){ 124 + public function getWeekManageList($start,$end,$dept_id = 1,$order = 'complete_num',$sort){
125 if(empty($start) || empty($end)){ 125 if(empty($start) || empty($end)){
126 $start = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00 126 $start = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
127 $end = Carbon::now()->subWeek()->endOfWeek(); // 上周日 23:59:59 127 $end = Carbon::now()->subWeek()->endOfWeek(); // 上周日 23:59:59
128 } 128 }
129 $manageWeekModel = new TicketWeekManageCount(); 129 $manageWeekModel = new TicketWeekManageCount();
130 - $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]); 130 + $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id],$order,['*'],$sort);
131 $deptWeekModel = new TicketWeekDeptCount(); 131 $deptWeekModel = new TicketWeekDeptCount();
132 $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]); 132 $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
133 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList ?? []]); 133 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList ?? []]);
@@ -140,13 +140,13 @@ class TicketLogic extends BaseLogic @@ -140,13 +140,13 @@ class TicketLogic extends BaseLogic
140 * @method :post 140 * @method :post
141 * @time :2025/8/30 16:27 141 * @time :2025/8/30 16:27
142 */ 142 */
143 - public function getMonthManageList($start,$end,$dept_id){ 143 + public function getMonthManageList($start,$end,$dept_id = 1,$order = 'complete_num',$sort = 'desc'){
144 if(empty($start) || empty($end)){ 144 if(empty($start) || empty($end)){
145 $start = Carbon::now()->subMonth()->startOfMonth(); // 上个月 1号 00:00:00 145 $start = Carbon::now()->subMonth()->startOfMonth(); // 上个月 1号 00:00:00
146 $end = Carbon::now()->subMonth()->endOfMonth(); // 上个月最后一天 23:59:59 146 $end = Carbon::now()->subMonth()->endOfMonth(); // 上个月最后一天 23:59:59
147 } 147 }
148 $manageWeekModel = new TicketMonthManageCount(); 148 $manageWeekModel = new TicketMonthManageCount();
149 - $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]); 149 + $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id],$order,['*'],$sort);
150 $deptWeekModel = new TicketMonthDeptCount(); 150 $deptWeekModel = new TicketMonthDeptCount();
151 $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]); 151 $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
152 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]); 152 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);