|
@@ -381,12 +381,20 @@ class FinanceController extends BaseController {
|
|
|
}
|
|
}
|
|
|
$dateRange = \Yii::$app->request->get('dateRange', '');
|
|
$dateRange = \Yii::$app->request->get('dateRange', '');
|
|
|
if ($dateRange) {
|
|
if ($dateRange) {
|
|
|
- $condition .= " AND CREATED_AT>:CREATED_START AND CREATED_AT<:CREATED_END";
|
|
|
|
|
- $params[':CREATED_START'] = Date::utcToTime($dateRange[0]);
|
|
|
|
|
- $params[':CREATED_END'] = Date::utcToTime($dateRange[1]);
|
|
|
|
|
|
|
+ $createAtStart = $dateRange[0] ?? '';
|
|
|
|
|
+ $createAtEnd = $dateRange[1] ?? '';
|
|
|
|
|
+ if ($createAtStart) {
|
|
|
|
|
+ $condition .= " AND CREATED_AT>:CREATED_START";
|
|
|
|
|
+ $params[':CREATED_START'] = Date::utcToTime($createAtStart);
|
|
|
|
|
+ }
|
|
|
|
|
+ if ($createAtEnd) {
|
|
|
|
|
+ $condition .= " AND CREATED_AT<:CREATED_END";
|
|
|
|
|
+ $params[':CREATED_END'] = Date::utcToTime($createAtEnd) + 86399;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
//获取可以查看几期流水
|
|
//获取可以查看几期流水
|
|
|
$showTransferPeriodNum = Cache::getSystemConfig()['showTransferPeriodNum']['VALUE'];
|
|
$showTransferPeriodNum = Cache::getSystemConfig()['showTransferPeriodNum']['VALUE'];
|
|
|
$periodArr = Period::getNearlyPeriodNum($showTransferPeriodNum);
|
|
$periodArr = Period::getNearlyPeriodNum($showTransferPeriodNum);
|