|
@@ -574,7 +574,7 @@ class StatisticService extends StatisticCommonService
|
|
|
$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)
|
|
$query->where('start_time', '>=', $month_start)
|
|
|
- ->where('end_time', '<', $month_end);
|
|
|
|
|
|
|
+ ->orWhere('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) {
|
|
@@ -605,7 +605,7 @@ class StatisticService extends StatisticCommonService
|
|
|
"type"
|
|
"type"
|
|
|
)->get()->toArray();
|
|
)->get()->toArray();
|
|
|
list($fee_amount, $fee_type_list) = $this->auxiliaryGroupListByRoot($auxiliary_list, $fee);
|
|
list($fee_amount, $fee_type_list) = $this->auxiliaryGroupListByRoot($auxiliary_list, $fee);
|
|
|
-
|
|
|
|
|
|
|
+ dd($item_key_list);
|
|
|
//找到项目和设备的费用然后进行比例计算
|
|
//找到项目和设备的费用然后进行比例计算
|
|
|
|
|
|
|
|
$return = [];
|
|
$return = [];
|
gogs