From 54b4f4344d4f2522ad2e8c305dc2230c080444ca Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Wed, 31 Jan 2024 16:57:57 +0800 Subject: [PATCH] update --- app/adminapi/controller/oa/FlowController.php | 108 +++++++++ app/adminapi/lists/oa/FlowLists.php | 91 ++++++++ app/adminapi/logic/oa/FlowLogic.php | 128 +++++++++++ app/adminapi/validate/oa/FlowTypeValidate.php | 6 +- app/adminapi/validate/oa/FlowValidate.php | 208 ++++++++++++++++++ app/common/model/oa/Flow.php | 47 ++++ 6 files changed, 585 insertions(+), 3 deletions(-) create mode 100644 app/adminapi/controller/oa/FlowController.php create mode 100644 app/adminapi/lists/oa/FlowLists.php create mode 100644 app/adminapi/logic/oa/FlowLogic.php create mode 100644 app/adminapi/validate/oa/FlowValidate.php create mode 100644 app/common/model/oa/Flow.php diff --git a/app/adminapi/controller/oa/FlowController.php b/app/adminapi/controller/oa/FlowController.php new file mode 100644 index 000000000..941880007 --- /dev/null +++ b/app/adminapi/controller/oa/FlowController.php @@ -0,0 +1,108 @@ +dataLists(new FlowLists()); + } + + + /** + * @notes 添加审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function add() + { + $params = (new FlowValidate())->post()->goCheck('add'); + $result = FlowLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(FlowLogic::getError()); + } + + + /** + * @notes 编辑审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function edit() + { + $params = (new FlowValidate())->post()->goCheck('edit'); + $result = FlowLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(FlowLogic::getError()); + } + + + /** + * @notes 删除审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function delete() + { + $params = (new FlowValidate())->post()->goCheck('delete'); + FlowLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取审批流程详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function detail() + { + $params = (new FlowValidate())->goCheck('detail'); + $result = FlowLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/oa/FlowLists.php b/app/adminapi/lists/oa/FlowLists.php new file mode 100644 index 000000000..4815f3328 --- /dev/null +++ b/app/adminapi/lists/oa/FlowLists.php @@ -0,0 +1,91 @@ + ['check_type', 'status'], + '%like%' => ['name'], + ]; + } + + + /** + * @notes 获取审批流程列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function lists(): array + { + return Flow::where($this->searchWhere) + ->field(['id', 'name', 'flow_cate', 'check_type', 'remark', 'status']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $flow_cate = FlowType::field('type,title,org_id,department_ids')->where('id',$data['flow_cate'])->findOrEmpty(); + $org = Orgs::field('name')->where('id',$flow_cate['org_id'])->findOrEmpty(); + $dept = Dept::where('id','in',$flow_cate['department_ids'])->column('name'); + $data['check_type'] = $data->check_type_text; + $data['status'] = $data->status_text; + $data['flow_type'] = $flow_cate->type_text; + $data['flow_cate'] = $flow_cate['title']; + $data['org_name'] = $org['name']; + $data['dept_name'] = implode(',',$dept); + }) + ->toArray(); + } + + + /** + * @notes 获取审批流程数量 + * @return int + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function count(): int + { + return Flow::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/oa/FlowLogic.php b/app/adminapi/logic/oa/FlowLogic.php new file mode 100644 index 000000000..86ac184c8 --- /dev/null +++ b/app/adminapi/logic/oa/FlowLogic.php @@ -0,0 +1,128 @@ + $params['name'], + 'flow_cate' => $params['flow_cate'], + 'check_type' => $params['check_type'], + 'remark' => $params['remark'] ?? '', + 'flow_list' => $params['check_type'] != 2 ? json_encode($params['flow_list']) : null, + 'status' => 2, + 'copy_uids' => implode(',',$params['copy_uids']), + ]); + 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/31 14:44 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Flow::where('id', $params['id'])->update([ + 'name' => $params['name'], + 'flow_cate' => $params['flow_cate'], + 'check_type' => $params['check_type'], + 'remark' => $params['remark'] ?? '', + 'flow_list' => $params['check_type'] != 2 ? json_encode($params['flow_list']) : null, + 'status' => $params['status'], + 'copy_uids' => implode(',',$params['copy_uids']), + ]); + 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/31 14:44 + */ + public static function delete(array $params): bool + { + return Flow::destroy($params['id']); + } + + + /** + * @notes 获取审批流程详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public static function detail($params): array + { + $data = Flow::field('id,name,flow_cate,check_type,remark,flow_list,status,copy_uids')->findOrEmpty($params['id']); + $flow_cate = FlowType::field('type,org_id,department_ids')->where('id',$data['flow_cate'])->findOrEmpty(); + $org = Orgs::field('name')->where('id',$flow_cate['org_id'])->findOrEmpty(); + $dept = Dept::where('id','in',$flow_cate['department_ids'])->column('name'); + $data['check_type'] = (string)$data['check_type']; + $data['status'] = (string)$data['status']; + $data['flow_type'] = (string)$flow_cate['type']; + $data['org_name'] = $org['name']; + $data['dept_name'] = implode(',',$dept); + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/oa/FlowTypeValidate.php b/app/adminapi/validate/oa/FlowTypeValidate.php index 5ad491510..f127dfdba 100644 --- a/app/adminapi/validate/oa/FlowTypeValidate.php +++ b/app/adminapi/validate/oa/FlowTypeValidate.php @@ -129,13 +129,13 @@ class FlowTypeValidate extends BaseValidate if(!is_array($value)){ return '应用部门数据格式错误'; } - foreach($value as $v){ + foreach($value as $k=>$v){ $dept = Dept::where('id',$v)->findOrEmpty(); if($dept->isEmpty()){ - return '部门不存在'; + return '第'.($k+1).'个部门信息不存在'; } if($dept['org_id'] != $data['org_id']) { - return '部门信息无效'; + return '第'.($k+1).'个部门不属于当前所选择的组织'; } } return true; diff --git a/app/adminapi/validate/oa/FlowValidate.php b/app/adminapi/validate/oa/FlowValidate.php new file mode 100644 index 000000000..9db8d7161 --- /dev/null +++ b/app/adminapi/validate/oa/FlowValidate.php @@ -0,0 +1,208 @@ + 'require', + 'name' => 'require', + 'flow_cate' => 'require|checkFlowCate', + 'check_type' => 'require|checkCheckType', + 'flow_list' => 'requireCallback:check_require|checkFlowList', + 'status' => 'require|checkStatus', + 'copy_uids' => 'array|checkCopyUids', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'name' => '审批流名称', + 'flow_cate' => '审批类型', + 'check_type' => '审批流类型', + 'flow_list' => '审批流程', + 'status' => '状态', + 'copy_uids' => '抄送人', + ]; + + + /** + * @notes 添加场景 + * @return FlowValidate + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function sceneAdd() + { + return $this->remove('id',true)->remove('status',true); + } + + + /** + * @notes 编辑场景 + * @return FlowValidate + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function sceneEdit() + { + return $this->only(['id','name','flow_cate','check_type','flow_list','status','copy_uids']); + } + + + /** + * @notes 删除场景 + * @return FlowValidate + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return FlowValidate + * @author likeadmin + * @date 2024/01/31 14:44 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkFlowCate($value): bool|string + { + $data = FlowType::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '审批类型信息不存在'; + } + return true; + } + + public function checkCheckType($value): bool|string + { + $dict = DictData::where('type_value','flow_check_type')->column('value'); + if(!in_array($value,$dict)){ + return '审批流类型值无效'; + } + return true; + } + + public function check_require($value, $data): bool + { + if($data['check_type'] != 2){ + return true; + } + return false; + } + + public function checkFlowList($value,$rule,$data): bool|string + { + if(!is_array($value)){ + return '审批流程数据格式错误'; + } + //固定审批 + if($data['check_type'] == 1){ + $dict = DictData::where('type_value','flow_step_flow_type')->column('value'); + foreach($value as $k=>$v){ + if(empty($v['flow_step'])){ + return '请选择审批步骤类型'; + }else{ + if(!in_array($v['flow_step'],$dict)){ + return '审批步骤类型值无效'; + } + } + if($v['flow_step'] == 2 || $v['flow_step'] == 3){ + if(empty($v['flow_user'])){ + return '审批流程第'.($k+1).'行的指定人未选择'; + } + if(!is_array($v['flow_user'])){ + return '审批流程第'.($k+1).'行的指定人数据格式错误'; + } + foreach($v['flow_user'] as $k2 => $v2){ + $admin = Admin::where('id',$v2)->findOrEmpty(); + if($admin->isEmpty()){ + return '审批流程第'.($k+1).'行的第'.($k2+1).'个指定人信息不存在'; + } + } + } + } + } + if($data['check_type'] == 3){ + foreach($value as $k=>$v){ + if(empty($v['flow_step'])){ + return '请填写审批步骤名称'; + } + if(empty($v['flow_user'])){ + return '审批流程第'.($k+1).'行的指定人未选择'; + } + if(!is_array($v['flow_user'])){ + return '审批流程第'.($k+1).'行的指定人数据格式错误'; + } + foreach($v['flow_user'] as $k2 => $v2){ + $admin = Admin::where('id',$v2)->findOrEmpty(); + if($admin->isEmpty()){ + return '审批流程第'.($k+1).'行的第'.($k2+1).'个指定人信息不存在'; + } + } + } + } + return true; + } + + public function checkCopyUids($value): bool|string + { + foreach($value as $k=>$v){ + $admin = Admin::where('id',$v)->findOrEmpty(); + if($admin->isEmpty()){ + return '第'.($k+1).'个抄送人信息不存在'; + } + } + return true; + } + + public function checkStatus($value){ + $dict = DictData::where('type_value','flow_type_status')->column('value'); + if(!in_array($value,$dict)){ + return '状态值无效'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/oa/Flow.php b/app/common/model/oa/Flow.php new file mode 100644 index 000000000..233b28bdd --- /dev/null +++ b/app/common/model/oa/Flow.php @@ -0,0 +1,47 @@ +column('name','value'); + return !empty($data['check_type']) ? $dict[$data['check_type']] : ''; + } + + public function getStatusTextAttr($value,$data){ + $dict = DictData::where('type_value','flow_type_status')->column('name','value'); + return !empty($data['status']) ? $dict[$data['status']] : ''; + } + + public function getFlowListAttr($value){ + return !empty($value) ? json_decode($value,true) : ''; + } +} \ No newline at end of file