hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

month

Browse Source
This commit is contained in:
邓皓元 2019-02-26 17:05:59 +08:00
parent b47c0e1e01
commit c1d41f7b73
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Domains/Virtual/Repositories/FlowPoolRepository.php
View File

@ -76,7 +76,9 @@ class FlowPoolRepository extends Repository
if (isset($conditions['month'])) { if (isset($conditions['month'])) {
$time = Carbon::parse($conditions['month'])->format('Y-m-d H:i:s'); $time = Carbon::parse($conditions['month'])->format('Y-m-d H:i:s');
$this->model = $this->model->where(function ($subQuery) use ($time) { $this->model = $this->model->where(function ($subQuery) use ($time) {
$subQuery->where('start_at', '<=', $time)->where('end_at', '>=', $time); $subQuery->where('start_at', '<=', $time)->where(function ($endAtQuery) use ($time) {
$endAtQuery->where('end_at', '>=', $time)->orWhereNull('end_at');
});
}); });
} }