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-16 15:31:59 +08:00
parent b19a5517b3
commit 7cafe46a06
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,7 +588,9 @@ 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']])->whereTime('date','today')->order('date desc')->field('positioning,date,end_date')->find(); $date=date('Y-m-d H:i:s');
$end=date('Y-m-d H:i:s',time()-300);
$find=Db::name('positioning')->where(['member_code'=>$v['member_code']])->whereTime('date',[$end,$date])->order('date desc')->field('positioning,date,end_date')->find();
$data[$k]=[ $data[$k]=[
'name'=>$v['name'], 'name'=>$v['name'],
'avatar'=>$v['avatar'], 'avatar'=>$v['avatar'],
@ -629,7 +631,7 @@ class Project extends BasicApi
if($date==''){ if($date==''){
$date=date('Y-m-d H:i:s'); $date=date('Y-m-d H:i:s');
$end=date('Y-m-d H:i:s',time()-300); $end=date('Y-m-d H:i:s',time()-300);
$select=Db::name('positioning')->where(['member_code'=>$code])->whereTime('date',[$end,$date])->column('positioning'); $select=Db::name('positioning')->where(['member_code'=>$code])->whereTime('date',[$end,$date])->fetchSql(true)->column('positioning');
}else{ }else{
$select=Db::name('positioning')->where(['member_code'=>$code])->whereBetweenTime('date',$date)->column('positioning'); $select=Db::name('positioning')->where(['member_code'=>$code])->whereBetweenTime('date',$date)->column('positioning');
} }