mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-01-15 17:22:30 +08:00
parent 028a06bf13
commit 068fb364fe
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/project/controller/Project.php
View File

@ -588,15 +588,26 @@ class Project extends BasicApi
} }
$data=[]; $data=[];
foreach($select as $k=>$v){ foreach($select as $k=>$v){
$find=Db::name('positioning')->where(['member_code'=>$v['member_code']])->order('date desc')->field('positioning,date,end_date')->find(); $find=Db::name('positioning')->where(['member_code'=>$v['member_code']])->whereDay('date')->order('date desc')->field('positioning,date,end_date')->find();
$data[]=[ $data[$k]=[
'name'=>$v['name'], 'name'=>$v['name'],
'avatar'=>$v['avatar'], 'avatar'=>$v['avatar'],
'member_code'=>$v['member_code'], 'member_code'=>$v['member_code'],
'positioning'=>$find['positioning']??'', 'positioning'=>$find['positioning']??'',
'date'=>$find['date']??'', 'date'=>$find['date']??'',
'end_date'=>$find['end_date']??'', 'end_date'=>'',
]; ];
if($v['end_date']){
$endTime = strtotime($v['end']);
$createTime = strtotime($v['end_date']);
if ($endTime > $createTime) {
$timeDifference = abs($endTime - $createTime);
// 计算天数
$days = $timeDifference / 60;
$data[$k]['end_date']=$days.'分钟';
}
}
} }
$this->success('',$data); $this->success('',$data);