diff --git a/app/Http/Controllers/Admin/CalendarsController.php b/app/Http/Controllers/Admin/CalendarsController.php
new file mode 100644
index 0000000..c8e8068
--- /dev/null
+++ b/app/Http/Controllers/Admin/CalendarsController.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Exports\BaseExport;
+use App\Helpers\ResponseCode;
+use App\Models\AppointmentType;
+use App\Models\Book;
+use App\Models\Calendar;
+use App\Models\CourseContentEvaluationAsk;
+use App\Models\CourseContentEvaluationForm;
+use App\Models\CustomForm;
+use App\Models\CustomFormField;
+use App\Models\SupplyDemand;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use Maatwebsite\Excel\Facades\Excel;
+use Rap2hpoutre\FastExcel\FastExcel;
+
+class CalendarsController extends BaseController
+{
+
+    /**
+     * 构造函数
+     */
+    public function __construct()
+    {
+        parent::__construct(new Calendar());
+    }
+
+
+    /**
+     * @OA\Get(
+     *     path="/api/admin/calendars/index",
+     *     tags={"日历管理"},
+     *     summary="列表",
+     *     description="",
+     *     @OA\Parameter(name="is_export", in="query", @OA\Schema(type="string"), required=false, description="是否导出0否1是"),
+     *     @OA\Parameter(name="export_fields", in="query", @OA\Schema(type="string"), required=false, description="需要导出的字段数组"),
+     *     @OA\Parameter(name="filter", in="query", @OA\Schema(type="string"), required=false, description="查询条件。数组"),
+     *     @OA\Parameter(name="show_relation", in="query", @OA\Schema(type="string"), required=false, description="需要输出的关联关系数组，包括：teacher，courseSettings，coursePeriods"),
+     *     @OA\Parameter(name="page_size", in="query", @OA\Schema(type="string"), required=false, description="每页显示的条数"),
+     *     @OA\Parameter(name="page", in="query", @OA\Schema(type="string"), required=false, description="页码"),
+     *     @OA\Parameter(name="sort_name", in="query", @OA\Schema(type="string"), required=false, description="排序字段名字"),
+     *     @OA\Parameter(name="sort_type", in="query", @OA\Schema(type="string"), required=false, description="排序类型"),
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=true, description="关键词"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="暂无"
+     *     )
+     * )
+     */
+    public function index()
+    {
+        $all = request()->all();
+        $list = $this->model->with('user')->where(function ($query) use ($all) {
+            if (isset($all['filter']) && !empty($all['filter'])) {
+                foreach ($all['filter'] as $condition) {
+                    $key = $condition['key'] ?? null;
+                    $op = $condition['op'] ?? null;
+                    $value = $condition['value'] ?? null;
+                    if (!isset($key) || !isset($op) || !isset($value)) {
+                        continue;
+                    }
+                    // 等于
+                    if ($op == 'eq') {
+                        $query->where($key, $value);
+                    }
+                    // 不等于
+                    if ($op == 'neq') {
+                        $query->where($key, '!=', $value);
+                    }
+                    // 大于
+                    if ($op == 'gt') {
+                        $query->where($key, '>', $value);
+                    }
+                    // 大于等于
+                    if ($op == 'egt') {
+                        $query->where($key, '>=', $value);
+                    }
+                    // 小于
+                    if ($op == 'lt') {
+                        $query->where($key, '<', $value);
+                    }
+                    // 小于等于
+                    if ($op == 'elt') {
+                        $query->where($key, '<=', $value);
+                    }
+                    // 模糊搜索
+                    if ($op == 'like') {
+                        $query->where($key, 'like', '%' . $value . '%');
+                    }
+                    // 否定模糊搜索
+                    if ($op == 'notlike') {
+                        $query->where($key, 'not like', '%' . $value . '%');
+                    }
+                    // 范围搜索
+                    if ($op == 'range') {
+                        list($from, $to) = explode(',', $value);
+                        if (empty($from) || empty($to)) {
+                            continue;
+                        }
+                        $query->whereBetween($key, [$from, $to]);
+                    }
+                }
+            }
+        })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc');
+        if (isset($all['is_export']) && !empty($all['is_export'])) {
+            $list = $list->get()->toArray();
+            $export_fields = $all['export_fields'] ?? [];
+            // 导出文件名字
+            $tableName = $this->model->getTable();
+            $filename = (new CustomForm())->getTableComment($tableName);
+            return Excel::download(new BaseExport($export_fields, $list, $tableName), $filename . date('YmdHis') . '.xlsx');
+        } else {
+            // 输出
+            $list = $list->paginate($all['page_size'] ?? 20);
+        }
+        return $this->success($list);
+    }
+
+    /**
+     * @OA\Get(
+     *     path="/api/admin/calendars/show",
+     *     tags={"日历管理"},
+     *     summary="详情",
+     *     description="",
+     *     @OA\Parameter(name="id", in="query", @OA\Schema(type="string"), required=true, description="id"),
+     *     @OA\Parameter(name="show_relation", in="query", @OA\Schema(type="string"), required=false, description="需要输出的关联关系数组，填写输出指定数据"),
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="暂无"
+     *     )
+     * )
+     */
+    public function show()
+    {
+        $all = \request()->all();
+        $messages = [
+            'id.required' => 'Id必填',
+        ];
+        $validator = Validator::make($all, [
+            'id' => 'required'
+        ], $messages);
+        if ($validator->fails()) {
+            return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
+        }
+        $detail = $this->model->with('user')->find($all['id']);
+        return $this->success($detail);
+    }
+
+    /**
+     * @OA\Post(
+     *     path="/api/admin/calendars/save",
+     *     tags={"日历管理"},
+     *     summary="保存",
+     *     description="",
+     *     @OA\Parameter(name="id", in="query", @OA\Schema(type="integer", format="int64"), required=true, description="课程内容评价字段ID（存在则更新，不存在则新增）"),
+     *     @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="integer", format="int32"), required=true, description="课程排课ID"),
+     *     @OA\Parameter(name="title", in="query", @OA\Schema(type="string"), required=true, description="标题"),
+     *     @OA\Parameter(name="type", in="query", @OA\Schema(type="string"), required=true, description="字段类型。单选radio，多选checkbox，问答text，评分number，日期date，日期时间datetime"),
+     *     @OA\Parameter(name="key", in="query", @OA\Schema(type="string"), required=true, description="英文标识"),
+     *     @OA\Parameter(name="remark", in="query", @OA\Schema(type="string"), required=false, description="备注"),
+     *     @OA\Parameter(name="sort", in="query", @OA\Schema(type="integer", format="int32"), required=false, description="排序"),
+     *     @OA\Parameter(name="options", in="query", @OA\Schema(type="string"), required=false, description="选项，以英文逗号分隔"),
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="认证token"),
+     *     @OA\Response(
+     *         response="200",
+     *         description="操作成功"
+     *     )
+     * )
+     */
+    public function save()
+    {
+        return parent::save();
+    }
+
+    /**
+     * @OA\Get(
+     *     path="/api/admin/calendars/destroy",
+     *     tags={"日历管理"},
+     *     summary="删除",
+     *     description="",
+     *     @OA\Parameter(name="id", in="query", @OA\Schema(type="string"), required=true, description="id"),
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="暂无"
+     *     )
+     * )
+     */
+    public function destroy()
+    {
+        return parent::destroy();
+    }
+
+}
diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
index 3181f48..4748ebe 100755
--- a/app/Models/Calendar.php
+++ b/app/Models/Calendar.php
@@ -9,5 +9,10 @@ use Illuminate\Support\Facades\Cache;
 class Calendar extends SoftDeletesModel
 {
 
+    public function courseContent()
+    {
+        return $this->hasMany(CourseContent::class, '', '');
+    }
+
 }
 
diff --git a/app/Models/CourseContentEvaluationAsk.php b/app/Models/CourseContentEvaluationAsk.php
index 2276085..e8ef820 100644
--- a/app/Models/CourseContentEvaluationAsk.php
+++ b/app/Models/CourseContentEvaluationAsk.php
@@ -4,5 +4,6 @@ namespace App\Models;
 
 class CourseContentEvaluationAsk extends SoftDeletesModel
 {
+    protected $casts = ['select_item' => 'json'];
 
 }
diff --git a/routes/api.php b/routes/api.php
index 09b0ddf..694c070 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -198,6 +198,12 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () {
         Route::post('course-content-evaluation-form/save', [\App\Http\Controllers\Admin\CourseContentEvaluationFormController::class, "save"]);
         Route::get('course-content-evaluation-form/destroy', [\App\Http\Controllers\Admin\CourseContentEvaluationFormController::class, "destroy"]);
 
+        // 日历
+        Route::get('calendars/index', [\App\Http\Controllers\Admin\CalendarsController::class, "index"]);
+        Route::get('calendars/show', [\App\Http\Controllers\Admin\CalendarsController::class, "show"]);
+        Route::post('calendars/save', [\App\Http\Controllers\Admin\CalendarsController::class, "save"]);
+        Route::get('calendars/destroy', [\App\Http\Controllers\Admin\CalendarsController::class, "destroy"]);
+
     });
 
 });