Browse Source

完善功能

gorden 10 months ago
parent
commit
542ae10f57

+ 2 - 0
app/admin/controller/life/CinemaIlkController.php

@@ -31,6 +31,8 @@ class CinemaIlkController extends Curd
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['ilk_is_del'] = 0;
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'ilk_add_time';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

+ 2 - 0
app/admin/controller/life/CollegeTeachingController.php

@@ -30,6 +30,8 @@ class CollegeTeachingController extends Curd
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['teaching_is_del'] = 0;
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'teaching_addTime';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

+ 4 - 4
app/admin/controller/medical/DeptController.php

@@ -35,7 +35,7 @@ class DeptController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $format = 'tree';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'dept_sort';
+        $field = $field ?? 'dept_addTime';
         $where['dept_is_del'] = 0;
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
@@ -96,7 +96,7 @@ class DeptController extends Curd
                 $model->{$key} = $val;
             }
             // 上级
-            if ($model->dept_pid != 0){
+            if ($model->dept_pid != 0) {
                 $superior = $this->model->getByPrimaryKey($model->dept_pid);
                 $model->dept_path = $superior->dept_path . $model->dept_id . '/';
             }
@@ -157,8 +157,8 @@ class DeptController extends Curd
                 'dept_name' => $item->dept_name,
                 'dept_type' => $item->dept_type,
                 'dept_sort' => $item->dept_sort,
-                'dept_addTime' => $item->dept_addTime,
-                'dept_updateTime' => $item->dept_updateTime
+                'dept_addTime' => date("Y-m-d H:i:s", strtotime($item->dept_addTime)),
+                'dept_updateTime' => date("Y-m-d H:i:s", strtotime($item->dept_updateTime))
             ];
         }
         $tree = new Tree($format_items);

+ 1 - 1
app/admin/controller/sys_manage/AdvController.php

@@ -31,7 +31,7 @@ class AdvController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['adv_category'] = 'adv';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_addtimes';
+        $field = $field ?? 'adv_addtimes';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

+ 1 - 1
app/admin/controller/sys_manage/BannerController.php

@@ -31,7 +31,7 @@ class BannerController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['adv_category'] = 'banner';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_sort';
+        $field = $field ?? 'adv_addtimes';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

+ 6 - 0
app/model/Adv.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class Adv extends Model
@@ -15,4 +16,9 @@ class Adv extends Model
     const CREATED_AT = 'adv_addtimes';
 
     const UPDATED_AT = null;
+
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 6 - 0
app/model/Cinema.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class Cinema extends Model
@@ -15,4 +16,9 @@ class Cinema extends Model
     public const UPDATED_AT = 'cinema_updateTime';
 
     protected $dateFormat = 'U';
+
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 6 - 0
app/model/CinemaPerformers.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class CinemaPerformers extends Model
@@ -13,4 +14,9 @@ class CinemaPerformers extends Model
     protected $dateFormat = 'U';
     public const CREATED_AT = 'performers_create_time';
     public const UPDATED_AT = 'performers_update_time';
+
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 6 - 0
app/model/CollegeCourses.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class CollegeCourses extends Model
@@ -16,6 +17,11 @@ class CollegeCourses extends Model
 
     public const UPDATED_AT = 'courses_updateTime';
 
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
     public function category()
     {
         return $this->hasOne(SysCategory::class, 'category_id', 'courses_category_id');

+ 6 - 0
app/model/CollegeTeacher.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class CollegeTeacher extends Model
@@ -15,4 +16,9 @@ class CollegeTeacher extends Model
     public const CREATED_AT = 'teacher_addTime';
 
     public const UPDATED_AT = 'teacher_updateTime';
+
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 9 - 2
app/model/CollegeTeaching.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class CollegeTeaching extends Model
@@ -16,7 +17,13 @@ class CollegeTeaching extends Model
 
     public const UPDATED_AT = 'teaching_updateTime';
 
-    public function course(){
-        return $this->hasOne(CollegeCourses::class,'courses_id','teaching_courses_id');
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format("Y-m-d H:i:s");
+    }
+
+    public function course()
+    {
+        return $this->hasOne(CollegeCourses::class, 'courses_id', 'teaching_courses_id');
     }
 }

+ 5 - 4
app/model/MedicalDept.php

@@ -12,12 +12,13 @@ class MedicalDept extends Model
 
     protected $dateFormat = 'U';
 
-    public const CREATED_AT = 'dept_addTime';
+    const CREATED_AT = 'dept_addTime';
 
-    public const UPDATED_AT = 'dept_updateTime';
+    const UPDATED_AT = 'dept_updateTime';
 
-    public function getDeptAddTimeAttribute($value){
-        return date('Y-m-d H:i:s',$value);
+    public function serializeDate(\DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
     }
 
     /**

+ 5 - 0
app/model/MedicalDoctor.php

@@ -15,4 +15,9 @@ class MedicalDoctor extends Model
     public const CREATED_AT = 'doctor_addTime';
 
     public const UPDATED_AT = 'doctor_updateTime';
+
+    public function serializeDate(\DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 5 - 0
app/model/MedicalReservationService.php

@@ -15,4 +15,9 @@ class MedicalReservationService extends Model
     public const CREATED_AT = 'service_addTime';
 
     public const UPDATED_AT = 'service_updateTime';
+
+    public function serializeDate(\DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

+ 5 - 0
app/model/MedicalSalesman.php

@@ -16,6 +16,11 @@ class MedicalSalesman extends Model
 
     public const UPDATED_AT = 'salesman_updateTime';
 
+    public function serializeDate(\DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
     public function shop()
     {
         return $this->hasOne(MedicalShop::class,'shop_id','salesman_shop_id');

+ 6 - 0
app/model/MedicalShop.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class MedicalShop extends Model
@@ -16,6 +17,11 @@ class MedicalShop extends Model
 
     public const UPDATED_AT = 'shop_updateTime';
 
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
     public static $shopType = [
         1 => '医疗',
         2 => '健康',