From f9c1044aa9baf72806332d2ccedc35b4198b203f Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 23 May 2024 14:22:02 +0800 Subject: [PATCH] update --- .../controller/works/rcbg/OaPlanController.php | 7 +++++++ app/adminapi/logic/works/rcbg/OaPlanLogic.php | 17 +++++++++++++++++ .../validate/works/rcbg/OaPlanValidate.php | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/app/adminapi/controller/works/rcbg/OaPlanController.php b/app/adminapi/controller/works/rcbg/OaPlanController.php index 55caed84f..64cc42ff6 100644 --- a/app/adminapi/controller/works/rcbg/OaPlanController.php +++ b/app/adminapi/controller/works/rcbg/OaPlanController.php @@ -103,6 +103,13 @@ class OaPlanController extends BaseAdminController $result = OaPlanLogic::detail($params); return $this->data($result); } + + public function calendar(){ + $params = (new OaPlanValidate())->get()->goCheck('calendar'); + $params['admin_id'] = $this->adminId; + $result = OaPlanLogic::calendar($params); + return $this->data($result); + } } \ No newline at end of file diff --git a/app/adminapi/logic/works/rcbg/OaPlanLogic.php b/app/adminapi/logic/works/rcbg/OaPlanLogic.php index 39618bff9..3c78e3f33 100644 --- a/app/adminapi/logic/works/rcbg/OaPlanLogic.php +++ b/app/adminapi/logic/works/rcbg/OaPlanLogic.php @@ -165,4 +165,21 @@ class OaPlanLogic extends BaseLogic $data['remind_type_text'] = $data->remind_type_text; return $data->toArray(); } + + /** + * @notes 获取日程安排日历 + * @param $params + * @return array + * @author likeadmin + * @date 2024/05/23 11:53 + */ + public static function calendar($params){ + $where[] = [ + ['admin_id','=',$params['admin_id']], + ['start_time','>=',strtotime($params['start_time'])], + ['end_time','<=',strtotime($params['end_time'])] + ]; + $data = OaPlan::where($where)->select()->toArray(); + return $data; + } } \ No newline at end of file diff --git a/app/adminapi/validate/works/rcbg/OaPlanValidate.php b/app/adminapi/validate/works/rcbg/OaPlanValidate.php index 0ad3b8d77..e8a1e30f9 100644 --- a/app/adminapi/validate/works/rcbg/OaPlanValidate.php +++ b/app/adminapi/validate/works/rcbg/OaPlanValidate.php @@ -102,6 +102,11 @@ class OaPlanValidate extends BaseValidate return $this->only(['id']); } + public function sceneCalendar() + { + return $this->only(['start_time','end_time']); + } + public function checkData($value): bool|string { $data = OaPlan::field('id')->where('id',$value)->findOrEmpty();