Commit c0ebb19f authored by hujun's avatar hujun

调整收款搜索

parent fe8ca4c1
...@@ -2948,17 +2948,17 @@ class Finance extends Basic ...@@ -2948,17 +2948,17 @@ class Finance extends Basic
/*提交时间 end*/ /*提交时间 end*/
/*入账日期 start*/ /*入账日期 start*/
if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) { if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) {
$where['a.income_time'] = ['> time', $this->params['income_start_time'] . ' 00:00:00']; $where['b.income_time'] = ['> time', $this->params['income_start_time'] . ' 00:00:00'];
$is_show = 1; $is_show = 1;
} }
if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) { if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) {
$where['a.income_time'] = ['< time', $this->params['end_time'] . ' 23:59:59']; $where['b.income_time'] = ['< time', $this->params['end_time'] . ' 23:59:59'];
$is_show = 1; $is_show = 1;
} }
if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) { if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) {
$where['a.income_time'] = ['between time', [ $where['b.income_time'] = ['between time', [
$this->params['income_start_time'] . ' 00:00:00', $this->params['income_end_time'] . ' 23:59:59' $this->params['income_start_time'] . ' 00:00:00', $this->params['income_end_time'] . ' 23:59:59'
]]; ]];
$is_show = 1; $is_show = 1;
......
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