Merge pull request '优化特殊补点的比例获取' (#557) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/557
master
廖金灵 3 years ago
commit 3c3b948801

@ -1966,7 +1966,7 @@ class CompanyStatementController extends ThinkController
$map['payed_time'] = ['between', [$start_time, $end_time]]; $map['payed_time'] = ['between', [$start_time, $end_time]];
$radioMap['_string'] = "(begin_time>{$start_time} and begin_time<{$end_time}) $radioMap['_string'] = "(begin_time>{$start_time} and begin_time<{$end_time})
or (end_time>{$start_time} and (end_time<{$end_time} and end_time!=0)) or (begin_time<{$start_time} and end_time>{$end_time})"; or (end_time>{$start_time} and (end_time<{$end_time} and end_time!=0)) or (begin_time<{$start_time} and end_time>{$end_time}) or (begin_time<{$start_time} and end_time = 0)";
} elseif (isset($_REQUEST['time_start'])) { } elseif (isset($_REQUEST['time_start'])) {
$map['payed_time'] = ['GT', $start_time]; $map['payed_time'] = ['GT', $start_time];

Loading…
Cancel
Save