From 6bff8f404ce7d4564d41b2414ab8aaae9f42d1c3 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Fri, 24 May 2024 18:08:11 +0800 Subject: [PATCH] update --- .../works/bgsp/OaFlowController.php | 108 ++++++++++ .../works/bgsp/OaFlowTypeController.php | 7 +- app/adminapi/lists/works/bgsp/OaFlowLists.php | 97 +++++++++ app/adminapi/logic/works/bgsp/OaFlowLogic.php | 170 +++++++++++++++ .../logic/works/bgsp/OaFlowTypeLogic.php | 16 +- .../validate/works/bgsp/OaFlowValidate.php | 203 ++++++++++++++++++ app/common/model/works/bgsp/OaFlow.php | 44 ++++ 7 files changed, 642 insertions(+), 3 deletions(-) create mode 100644 app/adminapi/controller/works/bgsp/OaFlowController.php create mode 100644 app/adminapi/lists/works/bgsp/OaFlowLists.php create mode 100644 app/adminapi/logic/works/bgsp/OaFlowLogic.php create mode 100644 app/adminapi/validate/works/bgsp/OaFlowValidate.php create mode 100644 app/common/model/works/bgsp/OaFlow.php diff --git a/app/adminapi/controller/works/bgsp/OaFlowController.php b/app/adminapi/controller/works/bgsp/OaFlowController.php new file mode 100644 index 000000000..7f8fec89d --- /dev/null +++ b/app/adminapi/controller/works/bgsp/OaFlowController.php @@ -0,0 +1,108 @@ +dataLists(new OaFlowLists()); + } + + + /** + * @notes 添加审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function add() + { + $params = (new OaFlowValidate())->post()->goCheck('add'); + $result = OaFlowLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(OaFlowLogic::getError()); + } + + + /** + * @notes 编辑审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function edit() + { + $params = (new OaFlowValidate())->post()->goCheck('edit'); + $result = OaFlowLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(OaFlowLogic::getError()); + } + + + /** + * @notes 删除审批流程 + * @return \think\response\Json + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function delete() + { + $params = (new OaFlowValidate())->post()->goCheck('delete'); + OaFlowLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取审批流程详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function detail() + { + $params = (new OaFlowValidate())->goCheck('detail'); + $result = OaFlowLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/works/bgsp/OaFlowTypeController.php b/app/adminapi/controller/works/bgsp/OaFlowTypeController.php index 4ce3220b1..4421c1421 100644 --- a/app/adminapi/controller/works/bgsp/OaFlowTypeController.php +++ b/app/adminapi/controller/works/bgsp/OaFlowTypeController.php @@ -86,8 +86,11 @@ class OaFlowTypeController extends BaseAdminController public function delete() { $params = (new OaFlowTypeValidate())->post()->goCheck('delete'); - OaFlowTypeLogic::delete($params); - return $this->success('删除成功', [], 1, 1); + $result = OaFlowTypeLogic::delete($params); + if (true === $result) { + return $this->success('删除成功', [], 1, 1); + } + return $this->fail(OaFlowTypeLogic::getError()); } diff --git a/app/adminapi/lists/works/bgsp/OaFlowLists.php b/app/adminapi/lists/works/bgsp/OaFlowLists.php new file mode 100644 index 000000000..b0da32d25 --- /dev/null +++ b/app/adminapi/lists/works/bgsp/OaFlowLists.php @@ -0,0 +1,97 @@ + ['check_type', 'type'], + '%like%' => ['name'], + ]; + } + + + /** + * @notes 获取审批流程列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function lists(): array + { + return OaFlow::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $data['type_text'] = $data->type_text; + $data['check_type_text'] = $data->check_type_text; + $flow_cate = OaFlowType::where('id',$data['flow_cate'])->findOrEmpty(); + $data['flow_cate_name'] = $flow_cate['title']; + if(!empty($data['department_ids'])){ + $dept = Dept::where('id','in',$data['department_ids'])->column('name'); + $data['department_names'] = implode(',',$dept); + }else{ + $data['department_names'] = '全公司'; + } + if(!empty($data['copy_uids'])){ + $copy_user = Admin::where('id','in',$data['copy_uids'])->column('name'); + $data['copy_user_names'] = implode(',',$copy_user); + }else{ + $data['copy_user_names'] = ''; + } + }) + ->toArray(); + } + + + /** + * @notes 获取审批流程数量 + * @return int + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function count(): int + { + return OaFlow::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/works/bgsp/OaFlowLogic.php b/app/adminapi/logic/works/bgsp/OaFlowLogic.php new file mode 100644 index 000000000..7dc835844 --- /dev/null +++ b/app/adminapi/logic/works/bgsp/OaFlowLogic.php @@ -0,0 +1,170 @@ + $params['name'], + 'check_type' => $params['check_type'], + 'type' => $params['type'], + 'flow_cate' => $params['flow_cate'], + 'department_ids' => $params['department_ids'] ?? '', + 'copy_uids' => $params['copy_uids'] ?? '', + 'remark' => $params['remark'] ?? '', + 'flow_list' => !empty($params['flow_list']) ? serialize($params['flow_list']) : '' + ]); + + 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/05/24 14:16 + */ + public static function edit(array $params): bool + { + if($params['check_type'] == 3){ + $flow_list = $params['flow_list']; + foreach($flow_list as &$v){ + $v['flow_type'] = 5; + } + $params['flow_list'] = $flow_list; + } + if($params['check_type'] == 2){ + $params['flow_list'] = ''; + } + Db::startTrans(); + try { + OaFlow::where('id', $params['id'])->update([ + 'name' => $params['name'], + 'check_type' => $params['check_type'], + 'type' => $params['type'], + 'flow_cate' => $params['flow_cate'], + 'department_ids' => $params['department_ids'] ?? '', + 'copy_uids' => $params['copy_uids'] ?? '', + 'remark' => $params['remark'] ?? '', + 'flow_list' => !empty($params['flow_list']) ? serialize($params['flow_list']) : '' + ]); + + 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/05/24 14:16 + */ + public static function delete(array $params): bool + { + return OaFlow::destroy($params['id']); + } + + + /** + * @notes 获取审批流程详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public static function detail($params): array + { + $data = OaFlow::findOrEmpty($params['id']); + $data['type_text'] = $data->type_text; + $data['check_type_text'] = $data->check_type_text; + $flow_cate = OaFlowType::where('id',$data['flow_cate'])->findOrEmpty(); + $data['flow_cate_name'] = $flow_cate['title']; + if(!empty($data['department_ids'])){ + $dept = Dept::where('id','in',$data['department_ids'])->column('name'); + $data['department_names'] = implode(',',$dept); + }else{ + $data['department_names'] = '全公司'; + } + if(!empty($data['copy_uids'])){ + $copy_user = Admin::where('id','in',$data['copy_uids'])->column('name'); + $data['copy_user_names'] = implode(',',$copy_user); + }else{ + $data['copy_user_names'] = ''; + } + $flow_list = unserialize($data['flow_list']); + foreach ($flow_list as &$v){ + if(!empty($v['flow_uids'])){ + $flow_users = Admin::where('id','in',$v['flow_uids'])->column('name'); + $v['flow_user_names'] = implode(',',$flow_users); + }else{ + $v['flow_user_names'] = ''; + } + } + $data['flow_list'] = $flow_list; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php b/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php index 0790698c6..84c534716 100644 --- a/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php +++ b/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php @@ -16,6 +16,7 @@ namespace app\adminapi\logic\works\bgsp; use app\common\model\dept\Dept; +use app\common\model\works\bgsp\OaFlow; use app\common\model\works\bgsp\OaFlowType; use app\common\logic\BaseLogic; use think\facade\Db; @@ -97,7 +98,20 @@ class OaFlowTypeLogic extends BaseLogic */ public static function delete(array $params): bool { - return OaFlowType::destroy($params['id']); + Db::startTrans(); + try { + OaFlowType::destroy($params['id']); + OaFlow::destroy(function($query)use($params){ + $query->where('flow_cate','=',$params['id']); + }); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } diff --git a/app/adminapi/validate/works/bgsp/OaFlowValidate.php b/app/adminapi/validate/works/bgsp/OaFlowValidate.php new file mode 100644 index 000000000..3d2f7ddc0 --- /dev/null +++ b/app/adminapi/validate/works/bgsp/OaFlowValidate.php @@ -0,0 +1,203 @@ + 'require', + 'name' => 'require', + 'check_type' => 'require|integer|in:1,2,3', + 'type' => 'require|checkType', + 'flow_cate' => 'require|checkFlowCate', + 'department_ids' => 'checkDept', + 'copy_uids' => 'checkCopyUser', + 'flow_list' => 'requireCallback:check_require|checkFlowList' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'name' => '审批流名称', + 'check_type' => '流程类型', + 'type' => '应用模块', + 'flow_cate' => '应用审批类型', + 'department_ids' => '应用部门', + 'copy_uids' => '抄送人', + 'flow_list' => '审批流程' + ]; + + + /** + * @notes 添加场景 + * @return OaFlowValidate + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function sceneAdd() + { + return $this->only(['name','check_type','type','flow_cate','department_ids','copy_uids','remark','flow_list']); + } + + + /** + * @notes 编辑场景 + * @return OaFlowValidate + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function sceneEdit() + { + return $this->only(['id','name','check_type','type','flow_cate','department_ids','copy_uids','remark','flow_list']); + } + + + /** + * @notes 删除场景 + * @return OaFlowValidate + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return OaFlowValidate + * @author likeadmin + * @date 2024/05/24 14:16 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkType($value): bool|string + { + $dict = DictData::where('type_value', 'oa_approve_cate')->column('value'); + if (!in_array($value, $dict)) { + return '所属分类数据值无效'; + } + return true; + } + + public function checkDept($value): bool|string + { + if(!empty($value)){ + $data = explode(',',$value); + if(empty($data)){ + return '应用部门数据错误'; + } + foreach($data as $v){ + $dept = Dept::where('id',$v)->findOrEmpty(); + if($dept->isEmpty()){ + return '应用部门信息不存在'; + } + } + } + return true; + } + + public function checkCopyUser($value): bool|string + { + if(!empty($value)){ + $data = explode(',',$value); + if(empty($data)){ + return '抄送人数据错误'; + } + foreach($data as $v){ + $user = Admin::where('id',$v)->findOrEmpty(); + if($user->isEmpty()){ + return '抄送人信息不存在'; + } + } + } + return true; + } + + public function checkFlowCate($value): bool|string + { + $data = OaFlowType::where('id',$value)->findOrEmpty(); + return $data->isEmpty() ? '审批类型不存在' : 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($data['check_type'] != 2) { + if(empty($value) || !is_array($value)) return '审批流程数据格式错误'; + if($data['check_type'] == 1){ + foreach ($value as $k=>$v) { + if(!isset($v['flow_type']) || !isset($v['flow_uids'])){ + return '固定审批流数据参数缺失'; + } + if(empty($v['flow_type']) || !in_array($v['flow_type'],[1,2,3,4])){ + return '固定审批流第'.($k+1).'行的类型未选择'; + } + if($v['flow_type'] > 2 && empty($v['flow_uids'])){ + return '固定审批流第'.($k+1).'行的指定人未选择'; + } + } + } + if($data['check_type'] == 3){ + foreach ($value as $k=>$v) { + if(!isset($v['flow_type']) || !isset($v['flow_uids']) || !isset($v['flow_name'])){ + return '可回退的审批流数据参数缺失'; + } + if(empty($v['flow_name'])){ + return '可回退的审批流第'.($k+1).'行的流程名称未填写'; + } + if(empty($v['flow_uids'])){ + return '可回退的审批流第'.($k+1).'行的指定人未选择'; + } + } + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/works/bgsp/OaFlow.php b/app/common/model/works/bgsp/OaFlow.php new file mode 100644 index 000000000..76ab4bc85 --- /dev/null +++ b/app/common/model/works/bgsp/OaFlow.php @@ -0,0 +1,44 @@ +column('name','value'); + return !empty($data['type']) ? $dict[$data['type']] : ''; + } + + public function getCheckTypeTextAttr($value,$data): string + { + $arr = [1=>'固定审批流',2=>'自由审批流',3=>'可回退的审批流']; + return !empty($data['check_type']) ? $arr[$data['check_type']] : ''; + } +} \ No newline at end of file