1

app/Service/ScheduleService.php

@@ -413,16 +413,19 @@ class ScheduleService extends Service
                 $keys = $value['schedule_id'] . $value['start_time'] . $value['end_time'];
                 if(isset($count[$keys])) continue;
                 $count[$keys] = 1;
-                $start_time = date("H:i",$value['start_time']);
-                $end_time = date("H:i",$value['end_time']);
                 $schedule_detail_info_list_map[$value['schedule_id']][] = [
-                    "schedule_id" => 14,
+                    "schedule_id" => $value['schedule_id'],
                     "day" => date('Y-m-d',$value['day']),
-                    "start_time" => $start_time,
-                    "end_time" => $end_time,
+                    "start_time" => date("H:i",$value['start_time']),
+                    "end_time" => date("H:i",$value['end_time']),
+                    "day_stamp" => $value['day'],
+                    "day_start_stamp" => $value['start_time'],
+                    "day_end_stamp" => $value['end_time'],
                 ];
             }
         }
+
+        //每个设置时间的数据
         $return = [];
         foreach ($schedule_map as $key => $value){
             if(isset($schedule_detail_info_list_map[$key])){
@@ -433,11 +436,15 @@ class ScheduleService extends Service
                             $tmp[] = [
                                 "start_time" => $vv['start_time'],
                                 "end_time" => $vv['end_time'],
+                                "schedule_id" => $vv['schedule_id'],
+                                "day_stamp" => $vv['day_stamp'],
+                                "day_start_stamp" => $vv['day_start_stamp'],
+                                "day_end_stamp" => $vv['day_end_stamp'],
                             ];
                         }
                     }
                     if(! empty($tmp)){
-                        $return[] = [
+                        $return[$v] = [
                             'time' => $v,
                             'detail' => $tmp
                         ];
@@ -446,12 +453,14 @@ class ScheduleService extends Service
             }
         }
 
-        foreach ($schedule as $key => $value){
-            $schedule[$key]['detail'] = $schedule_detail_list_map[$value['id']] ?? [];
+        //已满日期
+        $full = [];
+        foreach ($schedule_array as $value){
+            if(! isset($return[$value])) $full[] = $value;
         }
 
-        $result['time'] = $schedule_array;
-        $result['time_detail'] = $return;
+        $result['time'] = $full;
+        $result['time_detail'] = array_values($return);
 
         return [true, $result];
     }