|
@@ -8,7 +8,7 @@ discard block |
|
|
block discarded – undo |
|
8
|
8
|
// +---------------------------------------------------------------------- |
|
9
|
9
|
// | Author: liu21st <[email protected]> |
|
10
|
10
|
// +---------------------------------------------------------------------- |
|
11
|
|
-declare (strict_types = 1); |
|
|
11
|
+declare(strict_types=1); |
|
12
|
12
|
|
|
13
|
13
|
namespace think\db\concern; |
|
14
|
14
|
|
|
@@ -64,7 +64,7 @@ discard block |
|
|
block discarded – undo |
|
64
|
64
|
$op = is_array($range) ? 'between' : '>='; |
|
65
|
65
|
} |
|
66
|
66
|
|
|
67
|
|
- return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true); |
|
|
67
|
+ return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true); |
|
68
|
68
|
} |
|
69
|
69
|
|
|
70
|
70
|
/** |
|
@@ -80,7 +80,7 @@ discard block |
|
|
block discarded – undo |
|
80
|
80
|
public function whereTimeInterval(string $field, string $start, string $interval = 'day', int $step = 1, string $logic = 'AND') |
|
81
|
81
|
{ |
|
82
|
82
|
$startTime = strtotime($start); |
|
83
|
|
- $endTime = strtotime(($step > 0 ? '+' : '-') . abs($step) . ' ' . $interval . (abs($step) > 1 ? 's' : ''), $startTime); |
|
|
83
|
+ $endTime = strtotime(($step > 0 ? '+' : '-').abs($step).' '.$interval.(abs($step) > 1 ? 's' : ''), $startTime); |
|
84
|
84
|
|
|
85
|
85
|
return $this->whereTime($field, 'between', $step > 0 ? [$startTime, $endTime] : [$endTime, $startTime], $logic); |
|
86
|
86
|
} |
|
@@ -136,7 +136,7 @@ discard block |
|
|
block discarded – undo |
|
136
|
136
|
$year = date('Y', strtotime($year)); |
|
137
|
137
|
} |
|
138
|
138
|
|
|
139
|
|
- return $this->whereTimeInterval($field, $year . '-1-1', 'year', $step, $logic); |
|
|
139
|
+ return $this->whereTimeInterval($field, $year.'-1-1', 'year', $step, $logic); |
|
140
|
140
|
} |
|
141
|
141
|
|
|
142
|
142
|
/** |