From 6bec557ab6be7e8b9fad1aef2e5f234879a0598b Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 17 Jan 2024 10:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=B7=AE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectTripApplyController.php | 108 +++++++++++++ .../lists/project/ProjectTripApplyLists.php | 94 ++++++++++++ .../logic/project/ProjectTripApplyLogic.php | 140 +++++++++++++++++ .../project/ProjectTripApplyValidate.php | 144 ++++++++++++++++++ app/common.php | 8 + app/common/model/project/ProjectTripApply.php | 52 +++++++ 6 files changed, 546 insertions(+) create mode 100644 app/adminapi/controller/project/ProjectTripApplyController.php create mode 100644 app/adminapi/lists/project/ProjectTripApplyLists.php create mode 100644 app/adminapi/logic/project/ProjectTripApplyLogic.php create mode 100644 app/adminapi/validate/project/ProjectTripApplyValidate.php create mode 100644 app/common/model/project/ProjectTripApply.php diff --git a/app/adminapi/controller/project/ProjectTripApplyController.php b/app/adminapi/controller/project/ProjectTripApplyController.php new file mode 100644 index 000000000..abb5672f1 --- /dev/null +++ b/app/adminapi/controller/project/ProjectTripApplyController.php @@ -0,0 +1,108 @@ +dataLists(new ProjectTripApplyLists()); + } + + + /** + * @notes 添加出差申请 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function add() + { + $params = (new ProjectTripApplyValidate())->post()->goCheck('add'); + $result = ProjectTripApplyLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProjectTripApplyLogic::getError()); + } + + + /** + * @notes 编辑出差申请 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function edit() + { + $params = (new ProjectTripApplyValidate())->post()->goCheck('edit'); + $result = ProjectTripApplyLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProjectTripApplyLogic::getError()); + } + + + /** + * @notes 删除出差申请 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function delete() + { + $params = (new ProjectTripApplyValidate())->post()->goCheck('delete'); + ProjectTripApplyLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取出差申请详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function detail() + { + $params = (new ProjectTripApplyValidate())->goCheck('detail'); + $result = ProjectTripApplyLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/project/ProjectTripApplyLists.php b/app/adminapi/lists/project/ProjectTripApplyLists.php new file mode 100644 index 000000000..cb4531cea --- /dev/null +++ b/app/adminapi/lists/project/ProjectTripApplyLists.php @@ -0,0 +1,94 @@ + ['project_id', 'traffic'], + '%like%' => ['trip_apply_code', 'origin_address', 'target_address'], + ]; + } + + + /** + * @notes 获取出差申请列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function lists(): array + { + return ProjectTripApply::where($this->searchWhere) + ->field(['id', 'project_id', 'trip_apply_code', 'origin_address', 'target_address', 'traffic', 'start_date', 'end_date', 'reason', 'days', 'remark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $manager = ProjectManagerAppointment::field('project_manager')->where('project_id',$data['project_id'])->findOrEmpty(); + $data['traffic_text'] = $data->traffic_text; + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + if($manager->isEmpty()){ + $data['project_manager'] = ''; + }else{ + $admin = Admin::field('name')->where('id',$manager['project_manager'])->findOrEmpty(); + $data['project_manager'] = $admin['name']; + } + return $data; + }) + ->toArray(); + } + + + /** + * @notes 获取出差申请数量 + * @return int + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function count(): int + { + return ProjectTripApply::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/project/ProjectTripApplyLogic.php b/app/adminapi/logic/project/ProjectTripApplyLogic.php new file mode 100644 index 000000000..710365a3b --- /dev/null +++ b/app/adminapi/logic/project/ProjectTripApplyLogic.php @@ -0,0 +1,140 @@ + $params['project_id'], + 'trip_apply_code' => data_unique_code('项目出差'), + 'origin_address' => $params['origin_address'], + 'target_address' => $params['target_address'], + 'traffic' => $params['traffic'], + 'start_date' => strtotime($params['start_date']), + 'end_date' => strtotime($params['end_date']), + 'reason' => $params['reason'] ?? '', + 'days' => daysBetweenDates($params['start_date'],$params['end_date']), + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑出差申请 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProjectTripApply::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'origin_address' => $params['origin_address'], + 'target_address' => $params['target_address'], + 'traffic' => $params['traffic'], + 'start_date' => strtotime($params['start_date']), + 'end_date' => strtotime($params['end_date']), + 'reason' => $params['reason'] ?? '', + 'days' => daysBetweenDates($params['start_date'],$params['end_date']), + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'update_time' => time() + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除出差申请 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public static function delete(array $params): bool + { + return ProjectTripApply::destroy($params['id']); + } + + + /** + * @notes 获取出差申请详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public static function detail($params): array + { + $data = ProjectTripApply::field('id,project_id,trip_apply_code,origin_address,target_address,traffic,start_date,end_date,reason,days,remark,annex') + ->findOrEmpty($params['id']); + $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $manager = ProjectManagerAppointment::field('project_manager')->where('project_id',$data['project_id'])->findOrEmpty(); + $data['traffic_text'] = $data->traffic_text; + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + if($manager->isEmpty()){ + $data['project_manager'] = ''; + }else{ + $admin = Admin::field('name')->where('id',$manager['project_manager'])->findOrEmpty(); + $data['project_manager'] = $admin['name']; + } + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/project/ProjectTripApplyValidate.php b/app/adminapi/validate/project/ProjectTripApplyValidate.php new file mode 100644 index 000000000..c537bdbef --- /dev/null +++ b/app/adminapi/validate/project/ProjectTripApplyValidate.php @@ -0,0 +1,144 @@ + 'require', + 'project_id' => 'require|checkProject', + 'origin_address' => 'require', + 'target_address' => 'require', + 'traffic' => 'require|checkTraffic', + 'start_date' => 'require|dateFormat:Y-m-d', + 'end_date' => 'require|dateFormat:Y-m-d|checkEndDate', + 'annex' => 'checkAnnex' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'origin_address' => '出差起始地', + 'target_address' => '出差目的地', + 'traffic' => '交通工具', + 'start_date' => '出差时间', + 'end_date' => '结束时间', + ]; + + + /** + * @notes 添加场景 + * @return ProjectTripApplyValidate + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return ProjectTripApplyValidate + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return ProjectTripApplyValidate + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProjectTripApplyValidate + * @author likeadmin + * @date 2024/01/17 09:22 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkProject($value): bool|string + { + $data = Project::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目信息不存在'; + } + return true; + } + + public function checkTraffic($value): bool|string + { + $dict = DictData::where('type_value','traffic')->column('value'); + if(!in_array($value,$dict)){ + return '交通工具无效'; + } + return true; + } + + public function checkEndDate($value,$rule,$data): bool|string + { + $end_time = strtotime($value); + $start_time = strtotime($data['start_date']); + if($end_time <= $start_time){ + return '结束时间必须大于开始时间'; + } + return true; + } + + public function checkAnnex($value): bool|string + { + if(!empty($value) && $value != ''){ + if(!is_array($value)){ + return '附件格式错误'; + } + } + return true; + } +} \ No newline at end of file diff --git a/app/common.php b/app/common.php index 163544c69..bb5867741 100755 --- a/app/common.php +++ b/app/common.php @@ -343,3 +343,11 @@ function data_unique_code($str): string //质量检查单-20231215-0001 return $str.'-'.date('Ymd',time()).'-'.mt_rand(100000, 999999); } + +function daysBetweenDates($start_date,$end_date): bool|int +{ + $start = new DateTime($start_date); + $end = new DateTime($end_date); + $interval = $start->diff($end); + return $interval->days; +} diff --git a/app/common/model/project/ProjectTripApply.php b/app/common/model/project/ProjectTripApply.php new file mode 100644 index 000000000..b8b9c4d4a --- /dev/null +++ b/app/common/model/project/ProjectTripApply.php @@ -0,0 +1,52 @@ +column('name','value'); + return !empty($data['traffic']) ? $dict[$data['traffic']] : ''; + } +} \ No newline at end of file