周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 b74853e4bd67871a3b3c229cfa6b1afbaf23c3db 2 个父辈 6c558b55 06236ebd

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

Lyh server



查看合并请求 !2613
内嵌 并排对比
正在显示 2 个修改的文件 包含 19 行增加 和 17 行删除
... ... @@ -74,32 +74,29 @@ class TicketCount extends Command
$manageHrModel = new ManageHr();
$manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
$date = Carbon::yesterday()->toDateString(); // 昨日时间
// 当月开始时间（零点）
$startOfMonth = Carbon::now()->startOfMonth()->toDateTimeString();
// 当月结束时间（最后一秒）
$endOfMonth = Carbon::now()->endOfMonth()->toDateTimeString();
$ticketManageCountModel = new TicketDailyManageCount();
foreach ($manageList as $item){
$average_time = null;
$this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
$ticketLogModel = new TicketLog();
$ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
//当月工单总数
$month_ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'created_at'=>['between',[$startOfMonth,$endOfMonth]]]);
//工单总时长
$timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1])->sum('end_time');
$ticket_end_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
$complete_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
if(!empty($timeCount)){
$average_time = round($timeCount / $ticket_end_num, 2);
$average_time = round($timeCount / $complete_num, 2);
}
//最快完成的时间
$fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
//最快完成时间
if(!$fastest_time){
$fastest_time = null;
}
//超时工单数量
$timeout_num = $ticketLogModel->counts(['end_at'=>null,'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
$complete_num = $ticketLogModel->counts(['end_at'=>['!=',null],'engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
$timeout_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
if(!empty($timeout_num)){
$timeout_ratio = round($timeout_num / $ticket_num, 2);
}
$data = [
'date'=>$date,
'manage_id'=>$item['id'],
... ... @@ -110,9 +107,7 @@ class TicketCount extends Command
'timeout_num'=>$timeout_num,//超时工单数量
'complete_num'=>$complete_num,//完成工单数量
'dept_id'=>$item['dept_id'],
'month'=>$date('Y-m'),
'month_ticket_num'=>$month_ticket_num,
'timeout_ratio'=>$timeout_ratio
];
//查询当前用户是否当日已有记录
$ticketManageInfo = $ticketManageCountModel->read(['date'=>$date,'manage_id'=>$item['id']],['id']);
... ... @@ -150,12 +145,18 @@ class TicketCount extends Command
if(!empty($timeCount)){
$average_time = round($timeCount / $ticket_num, 2);
}
//超期工单数量
$timeout_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
if(!empty($timeout_num)){
$timeout_ratio = round($timeout_num / $ticket_num, 2);
}
$data = [
'date'=>$date,
'dept_id'=>$item['id'],
'dept_name'=>$item['name'],
'ticket_num'=>$ticket_num ?? 0,
'average_time'=>$average_time ?? null
'average_time'=>$average_time ?? null,
'timeout_ratio'=>$timeout_ratio ?? null
];
$deptInfo = $ticketDailyDeptModel->read(['date'=>$date,'dept_id'=>$item['id']],['id']);
if($deptInfo === false){
... ...
... ... @@ -59,12 +59,13 @@ class TicketLogic extends BaseLogic
public function getDailyTicketCount(){
$date = Carbon::yesterday()->toDateString(); //昨日时间
$dailyModel = new TicketDailyCount();
$dailyList = $dailyModel->list([],'date',['*'],'desc',5);//取最近5条数据
$dailyList = $dailyModel->list([],'date');//取最近5条数据
$manageModel = new TicketDailyManageCount();
$manageList = $manageModel->list(['date'=>$date,'ticket_num'=>['!=',0],'average_time'=>['!=','']],'average_time',['*'],'asc',5);//取最近5条数据
$manageList = $manageModel->list(['dept_id'=>1,'date'=>$date,'ticket_num'=>['!=',0],'average_time'=>['!=','']],'average_time',['*'],'asc');
$manage2List = $manageModel->list(['dept_id'=>2,'date'=>$date,'ticket_num'=>['!=',0],'average_time'=>['!=','']],'average_time',['*'],'asc');
$deptModel = new TicketDailyDeptCount();
$deptList = $deptModel->list(['date'=>$date,'ticket_num'=>['!=',0]],'average_time',['*'],'asc',5);
$data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
$data = ['daily'=>$dailyList,'manage'=>$manageList,'manage2'=>$manage2List,'dept'=>$deptList];
return $this->success($data);
}
... ...