周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 675154627e17bc519a9105bf74f96733a7875d20 1 个父辈 d3ed1634

未续费项目增加搜索

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 8 行删除
... ... @@ -89,7 +89,7 @@ class TicketController extends BaseController
'start.required' => 'start不能为空',
'end.required' => 'end不能为空',
]);
$data = $this->logic->getWeekManageList($this->param['start'],$this->param['end']);
$data = $this->logic->getWeekManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1);
$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']);
$data = $this->logic->getMonthManageList($this->param['start'],$this->param['end'],$this->param['dept_id'] ?? 1);
$this->response('success',Code::SUCCESS,$data);
}
... ...
... ... @@ -121,15 +121,15 @@ class TicketLogic extends BaseLogic
* @method :post
* @time :2025/8/30 16:02
*/
public function getWeekManageList($start,$end){
public function getWeekManageList($start,$end,$dept_id = 1){
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]);
$manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
$deptWeekModel = new TicketWeekDeptCount();
$deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
$deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);
}
... ... @@ -140,15 +140,15 @@ class TicketLogic extends BaseLogic
* @method :post
* @time :2025/8/30 16:27
*/
public function getMonthManageList($start,$end){
public function getMonthManageList($start,$end,$dept_id){
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]);
$manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
$deptWeekModel = new TicketMonthDeptCount();
$deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
$deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);
}
}
... ...