Skip to content

T
tl_estate
Commit eeba2787 authored by hujun's avatar hujun
Browse files
Options

is_del=0

parent f76cadb6
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
application/index/controller/Finance.php
View file @ eeba2787
...@@ -1341,8 +1341,7 @@ class Finance extends Basic ...@@ -1341,8 +1341,7 @@ class Finance 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['c.is_del'] = 0; $where['a.is_del'] = 0;
// $where['b.status'] = [ 'in', [ 10, 11, 13 ] ]; //10已提交 11审核成功
$where['a.father_id'] = [ 'neq', 0 ]; $where['a.father_id'] = [ 'neq', 0 ];
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) { if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
$where['a.operation_date'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ]; $where['a.operation_date'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ];
...@@ -1457,14 +1456,14 @@ class Finance extends Basic ...@@ -1457,14 +1456,14 @@ class Finance extends Basic
$where[1] = ['EXP', "e.create_time > '{$this->params['bargain_start_date']} 00:00:00' OR c.operation_date > '{$this->params['bargain_start_date']}'"]; $where[1] = ['EXP', "e.create_time > '{$this->params['bargain_start_date']} 00:00:00' OR c.operation_date > '{$this->params['bargain_start_date']}'"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])); $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date']));
$operation_start_data = $this->params['bargain_start_date'] . ' 00:00:00'; $operation_start_data = $this->params['bargain_start_date'];
} }
if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) { if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) {
$where[1] = ['EXP', "e.create_time < '{$this->params['bargain_end_date']} 23:59:59' OR c.operation_date < '{$this->params['bargain_end_date']}'"]; $where[1] = ['EXP', "e.create_time < '{$this->params['bargain_end_date']} 23:59:59' OR c.operation_date < '{$this->params['bargain_end_date']}'"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date'])); $operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date']));
$operation_end_data = $this->params['bargain_end_date'] . ' 23:59:59'; $operation_end_data = $this->params['bargain_end_date'];
} }
if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) { if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
...@@ -1473,8 +1472,8 @@ class Finance extends Basic ...@@ -1473,8 +1472,8 @@ class Finance extends Basic
$operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['bargain_end_date'])); $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['bargain_end_date']));
$operation_start_data = $this->params['bargain_start_date'] . ' 00:00:00'; $operation_start_data = $this->params['bargain_start_date'];
$operation_end_data = $this->params['bargain_end_date'] . ' 23:59:59'; $operation_end_data = $this->params['bargain_end_date'];
} }
/**部门id**/ /**部门id**/
......
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