|
@@ -590,8 +590,8 @@ class StatisticService extends Service
|
|
|
$item = Item::TopClear($user, $data);
|
|
$item = Item::TopClear($user, $data);
|
|
|
$item_list = $item->where('del_time', 0)
|
|
$item_list = $item->where('del_time', 0)
|
|
|
->where(function ($query) use ($month_start, $month_end) {
|
|
->where(function ($query) use ($month_start, $month_end) {
|
|
|
- $query->where('start_time', '<=', $month_start)
|
|
|
|
|
- ->orWhere('end_time', '>=', $month_end);
|
|
|
|
|
|
|
+ $query->where('start_time', '>=', $month_start)
|
|
|
|
|
+ ->where('end_time', '<=', $month_end);
|
|
|
})->select("code", "title", "start_time", "end_time", "id", "state")->orderby("start_time", "asc")->get()->toArray();
|
|
})->select("code", "title", "start_time", "end_time", "id", "state")->orderby("start_time", "asc")->get()->toArray();
|
|
|
$item_key_list = [];
|
|
$item_key_list = [];
|
|
|
foreach ($item_list as $v) {
|
|
foreach ($item_list as $v) {
|
|
@@ -938,8 +938,8 @@ class StatisticService extends Service
|
|
|
$item = Item::TopClear($user, $data);
|
|
$item = Item::TopClear($user, $data);
|
|
|
$item_list = $item->where('del_time', 0)
|
|
$item_list = $item->where('del_time', 0)
|
|
|
->where(function ($query) use ($month_start, $month_end) {
|
|
->where(function ($query) use ($month_start, $month_end) {
|
|
|
- $query->where('start_time', '<=', $month_start)
|
|
|
|
|
- ->orWhere('end_time', '>', $month_end);
|
|
|
|
|
|
|
+ $query->where('start_time', '>=', $month_start)
|
|
|
|
|
+ ->where('end_time', '<=', $month_end);
|
|
|
})->select("code", "title", "start_time", "end_time", "id", "state")->orderby("start_time", "asc")->get()->toArray();
|
|
})->select("code", "title", "start_time", "end_time", "id", "state")->orderby("start_time", "asc")->get()->toArray();
|
|
|
$item_key_list = [];
|
|
$item_key_list = [];
|
|
|
foreach ($item_list as $v) {
|
|
foreach ($item_list as $v) {
|
