|
|
@@ -86,22 +86,22 @@ class Purch extends Base
|
|
|
$start = isset($this->post['start']) && $this->post['start']!="" ?$this->post['start']:"";
|
|
|
if($start!=""){
|
|
|
// $where['addtime'] = Db::raw(" >= '{$start}'");
|
|
|
- $where[]=['po.addtime',">=", $start];
|
|
|
+ $where[]=['po.addtime',">=", $start." 00:00:00"];
|
|
|
}
|
|
|
$end = isset($this->post['end']) && $this->post['end']!="" ?$this->post['end']:"";
|
|
|
if($end!=""){
|
|
|
- $where[]=['po.addtime',"<=", $end];
|
|
|
+ $where[]=['po.addtime',"<=", $end." 23:59:59"];
|
|
|
}
|
|
|
$last_start = isset($this->post['last_start']) && $this->post['last_start']!="" ?$this->post['last_start']:"";
|
|
|
if($last_start!=""){
|
|
|
//$where['lasttime'] = Db::raw(" >= '{$last_start}'");
|
|
|
- $where[]=['po.lasttime',">=", $last_start];
|
|
|
+ $where[]=['po.lasttime',">=", $last_start." 00:00:00"];
|
|
|
|
|
|
}
|
|
|
$last_end = isset($this->post['last_end']) && $this->post['last_end']!="" ?$this->post['last_end']:"";
|
|
|
if($last_end!=""){
|
|
|
//$where['lasttime'] = Db::raw(" <= '{$last_end}'");
|
|
|
- $where[]=['po.lasttime',"<=", $last_end];
|
|
|
+ $where[]=['po.lasttime',"<=", $last_end." 23:59:59"];
|
|
|
}
|
|
|
$orderCode = isset($this->post['orderCode']) && $this->post['orderCode']!="" ?$this->post['orderCode']:"";
|
|
|
if($orderCode!=""){
|
