Commit a1f588df authored by zhuwei's avatar zhuwei

bug

parent 213439fe
...@@ -18,11 +18,13 @@ use think\Session; ...@@ -18,11 +18,13 @@ use think\Session;
class PerformanceInfo extends Basic class PerformanceInfo extends Basic
{ {
protected $oBargainModel; protected $oBargainModel;
protected $status;
public function __construct($request = null) public function __construct($request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->oBargainModel = new OBargainModel(); $this->oBargainModel = new OBargainModel();
$this->status = array('in','10,11,13');
} }
...@@ -35,7 +37,7 @@ class PerformanceInfo extends Basic ...@@ -35,7 +37,7 @@ class PerformanceInfo extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$where['Obargain.status'] = array('in','10,11,13,20'); $where['Obargain.status'] = $this->status;
/*开始结束时间*/ /*开始结束时间*/
if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) { if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
$where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']]; $where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];
...@@ -135,7 +137,7 @@ class PerformanceInfo extends Basic ...@@ -135,7 +137,7 @@ class PerformanceInfo extends Basic
public function getPerformanceInfoExcel() public function getPerformanceInfoExcel()
{ {
$where['Obargain.status'] = array('in','10,11,13,20'); $where['Obargain.status'] = $this->status;
/*开始结束时间*/ /*开始结束时间*/
if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) { if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
$where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']]; $where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment