From ab267c176053a66f295718ef359435026b91ba7b Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 23 May 2024 15:34:30 +0800 Subject: [PATCH] update --- .../works/rcbg/OaScheduleController.php | 7 +++++++ .../logic/works/rcbg/OaScheduleLogic.php | 17 +++++++++++++++++ .../validate/works/rcbg/OaScheduleValidate.php | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/app/adminapi/controller/works/rcbg/OaScheduleController.php b/app/adminapi/controller/works/rcbg/OaScheduleController.php index 2656ce3fb..1b6ffba1e 100644 --- a/app/adminapi/controller/works/rcbg/OaScheduleController.php +++ b/app/adminapi/controller/works/rcbg/OaScheduleController.php @@ -103,6 +103,13 @@ class OaScheduleController extends BaseAdminController $result = OaScheduleLogic::detail($params); return $this->data($result); } + + public function calendar(){ + $params = (new OaScheduleValidate())->get()->goCheck('calendar'); + $params['admin_id'] = $this->adminId; + $result = OaScheduleLogic::calendar($params); + return $this->data($result); + } } \ No newline at end of file diff --git a/app/adminapi/logic/works/rcbg/OaScheduleLogic.php b/app/adminapi/logic/works/rcbg/OaScheduleLogic.php index 6f1863489..7d5ae37c6 100644 --- a/app/adminapi/logic/works/rcbg/OaScheduleLogic.php +++ b/app/adminapi/logic/works/rcbg/OaScheduleLogic.php @@ -119,4 +119,21 @@ class OaScheduleLogic extends BaseLogic $data['labor_type_text'] = $data->labor_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 = OaSchedule::where($where)->select()->toArray(); + return $data; + } } \ No newline at end of file diff --git a/app/adminapi/validate/works/rcbg/OaScheduleValidate.php b/app/adminapi/validate/works/rcbg/OaScheduleValidate.php index 81bb93992..5a2056b89 100644 --- a/app/adminapi/validate/works/rcbg/OaScheduleValidate.php +++ b/app/adminapi/validate/works/rcbg/OaScheduleValidate.php @@ -100,5 +100,10 @@ class OaScheduleValidate extends BaseValidate { return $this->only(['id']); } + + public function sceneCalendar() + { + return $this->only(['start_time','end_time']); + } } \ No newline at end of file