Commit 3994d3b3 authored by zhuwei's avatar zhuwei

bug

parent 9e33a220
...@@ -35,7 +35,7 @@ class PerformanceInfo extends Basic ...@@ -35,7 +35,7 @@ class PerformanceInfo extends Basic
$where=[]; $where=[];
/*开始结束时间*/ /*开始结束时间*/
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']];
} }
if ($this->params['shop_type'] != NULL) { if ($this->params['shop_type'] != NULL) {
...@@ -87,6 +87,7 @@ class PerformanceInfo extends Basic ...@@ -87,6 +87,7 @@ class PerformanceInfo extends Basic
$field .= 'District.district_name,'; $field .= 'District.district_name,';
$field .= 'Houses.landmark,'; $field .= 'Houses.landmark,';
$field .= 'Oorder.house_id'; $field .= 'Oorder.house_id';
dump($where);
$return = $this->oBargainModel->performancelInfo($where,$field,$pageSize,$pageNo); $return = $this->oBargainModel->performancelInfo($where,$field,$pageSize,$pageNo);
$return_total = $this->oBargainModel->performancelInfoTotal($where,$field); $return_total = $this->oBargainModel->performancelInfoTotal($where,$field);
$field = 'sum(Obargain.scale_fee) as scale_fee_sum'; $field = 'sum(Obargain.scale_fee) as scale_fee_sum';
......
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