胡庆余堂

app/Service/ItemService.php

@@ -217,6 +217,7 @@ class ItemService extends Service
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['type'])) $model->where('type', $data['type']);
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
+        if(! empty($data['is_use'])) $model->where('is_use', $data['is_use']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
             $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
             $model->where('crt_time','>=',$return[0]);

app/Service/RDService.php

@@ -293,8 +293,10 @@ class RDService extends Service
             $data['data'][$key]['order_time'] = $value['order_time'] ? date('Y-m-d',$value['order_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['item_title'] = $emp2[$value['item_id']] ?? '';
-            $data['data'][$key]['start_time'] = $value['start_time_hour'] . ":" . $value['start_time_min'];
-            $data['data'][$key]['end_time'] = $value['end_time_hour'] . ":" . $value['end_time_min'];
+            $start_time = strtotime(date('Y-m-d',$value['order_time']) ." " . $value['start_time_hour'] . ":" . $value['start_time_min']);
+            $end_time = strtotime(date('Y-m-d',$value['order_time']) ." " . $value['end_time_hour'] . ":" . $value['end_time_min']);
+            $data['data'][$key]['start_time'] = date("H:i",$start_time);
+            $data['data'][$key]['end_time'] = date("H:i",$end_time);
             $data['data'][$key]['total_hours'] = bcdiv($value['total_hours'],60,2);
         }