|
|
@@ -379,7 +379,9 @@ class ScheduleService extends Service
|
|
|
}
|
|
|
|
|
|
public function getScheduleSetting($data,$user){
|
|
|
- if(empty($data['schedule'])) return [true,''];
|
|
|
+ $result['time'] = [];
|
|
|
+ $result['time_detail'] = [];
|
|
|
+ if(empty($data['schedule'])) return [true,$result];
|
|
|
// 获取指定年月的开始日期时间戳
|
|
|
$startTimestamp = strtotime($data['schedule'] . "-01");
|
|
|
// 获取下个月的开始日期时间戳，然后减去一秒得到本月的结束日期时间戳
|
|
|
@@ -391,7 +393,7 @@ class ScheduleService extends Service
|
|
|
->where('end_time', '<=', $endTimestamp)
|
|
|
->select('id','mark','start_time','end_time')
|
|
|
->get()->toArray();
|
|
|
- if(empty($schedule)) return [true,''];
|
|
|
+ if(empty($schedule)) return [true,$result];
|
|
|
$schedule_array = $schedule_map = [];
|
|
|
foreach ($schedule as $value){
|
|
|
for ($i = $value['start_time']; $i <= $value['end_time']; $i += 86400) { // 每天86400秒
|
cqpCow