update
This commit is contained in:
parent
807f604ae4
commit
24576688bb
@ -227,9 +227,9 @@ class CostConsultationReportController extends BaseAdminController
|
|||||||
}
|
}
|
||||||
if(!empty($params['date'])){
|
if(!empty($params['date'])){
|
||||||
$date = explode(',',$params['date']);
|
$date = explode(',',$params['date']);
|
||||||
$where[] = ['apptime','between',[$date]];
|
$where[] = ['apptime','between',[strtotime($date[0].' 00:00:00'),strtotime($date[1].' 23:59:59')]];
|
||||||
}
|
}
|
||||||
$lists = ProjectCommission::field('id,project_id')->where($where)->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
|
$lists = ProjectCommission::field('id,project_id,apptime')->where($where)->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
|
||||||
$project = CostProject::field('project_name,project_num,contract_id')->where('id',$data['project_id'])->findOrEmpty();
|
$project = CostProject::field('project_name,project_num,contract_id')->where('id',$data['project_id'])->findOrEmpty();
|
||||||
$contract = CostApprovedProject::field('contract_name')->where('id',$project['contract_id'])->findOrEmpty();
|
$contract = CostApprovedProject::field('contract_name')->where('id',$project['contract_id'])->findOrEmpty();
|
||||||
$data['project_num'] = $project['project_num'];
|
$data['project_num'] = $project['project_num'];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user