Merge pull request '测试资源-审查' (#679) from feature/testing_batch_list into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/679
master
廖金灵 2 years ago
commit 76d0e64b3d

@ -799,23 +799,23 @@ class TestingResourceController extends ThinkController
$createTimeStart = $params['create_time_start'] ?? '';
$createTimeEnd = $params['create_time_end'] ?? '';
$gameId = $params['game_id'] ?? 0;
$gameName = $params['gameName'] ?? 0;
$gameName = $params['game_name'] ?? '';
$conditions = [];
$strCondition = '1=1';
if ($createTimeStart) {
$strCondition .= ' and create_time >=' . strtotime($createTimeStart . ' 00:00:00');
$strCondition .= ' and create_time >="' . $createTimeStart . ' 00:00:00' . '"';
}
if ($createTimeEnd) {
$strCondition .= ' and create_time <=' . strtotime($createTimeEnd . ' 23:59:59');
$strCondition .= ' and create_time <="' . $createTimeEnd . ' 23:59:59' . '"';
}
if ($gameId) {
$conditions['game_id'] = $gameId;
}
if ($gameName) {
$conditions['gameName'] = $gameName;
$conditions['game_name'] = $gameName;
}
$conditions['_string'] = $strCondition;

Loading…
Cancel
Save