From fb0a7a98b48cab9f52f7a107d9b58169ad993462 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 18 Dec 2023 14:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectPlanController.php | 108 +++++++++ .../ProjectManagerAppointmentLists.php | 1 + .../lists/project/ProjectPlanLists.php | 86 +++++++ .../ProjectManagerAppointmentLogic.php | 4 +- .../logic/project/ProjectPlanLogic.php | 149 ++++++++++++ .../ProjectManagerAppointmentValidate.php | 2 +- .../validate/project/ProjectPlanValidate.php | 218 ++++++++++++++++++ app/common/model/project/ProjectPlan.php | 52 +++++ 8 files changed, 617 insertions(+), 3 deletions(-) create mode 100644 app/adminapi/controller/project/ProjectPlanController.php create mode 100644 app/adminapi/lists/project/ProjectPlanLists.php create mode 100644 app/adminapi/logic/project/ProjectPlanLogic.php create mode 100644 app/adminapi/validate/project/ProjectPlanValidate.php create mode 100644 app/common/model/project/ProjectPlan.php diff --git a/app/adminapi/controller/project/ProjectPlanController.php b/app/adminapi/controller/project/ProjectPlanController.php new file mode 100644 index 000000000..9c11f22d6 --- /dev/null +++ b/app/adminapi/controller/project/ProjectPlanController.php @@ -0,0 +1,108 @@ +dataLists(new ProjectPlanLists()); + } + + + /** + * @notes 添加项目计划 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function add() + { + $params = (new ProjectPlanValidate())->post()->goCheck('add'); + $result = ProjectPlanLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProjectPlanLogic::getError()); + } + + + /** + * @notes 编辑项目计划 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function edit() + { + $params = (new ProjectPlanValidate())->post()->goCheck('edit'); + $result = ProjectPlanLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProjectPlanLogic::getError()); + } + + + /** + * @notes 删除项目计划 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function delete() + { + $params = (new ProjectPlanValidate())->post()->goCheck('delete'); + ProjectPlanLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取项目计划详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function detail() + { + $params = (new ProjectPlanValidate())->goCheck('detail'); + $result = ProjectPlanLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php index 5c6850130..3fff5b7e5 100644 --- a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php +++ b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php @@ -81,6 +81,7 @@ class ProjectManagerAppointmentLists extends BaseAdminDataLists implements Lists $item['contract_code'] = $contract['contract_code']; $item['project_type_name'] = $projectType['name']; $item['project_manager_name'] = $admin['name']; + return $item; }) ->toArray(); } diff --git a/app/adminapi/lists/project/ProjectPlanLists.php b/app/adminapi/lists/project/ProjectPlanLists.php new file mode 100644 index 000000000..506e86914 --- /dev/null +++ b/app/adminapi/lists/project/ProjectPlanLists.php @@ -0,0 +1,86 @@ + ['start_time', 'deliver_time', 'declare_time'], + ]; + } + + + /** + * @notes 获取项目计划列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function lists(): array + { + return ProjectPlan::where($this->searchWhere) + ->field(['id', 'project_id', 'project_manage', 'start_time', 'deliver_time', 'declare_time', 'remark', 'annex']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($item){ + $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id',$item['project_manage'])->findOrEmpty(); + $item['project_name'] = $project['name']; + $item['project_code'] = $project['project_code']; + $item['project_manager_name'] = $admin['name']; + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取项目计划数量 + * @return int + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function count(): int + { + return ProjectPlan::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php index 5112fbbbe..125278504 100644 --- a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php +++ b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php @@ -60,7 +60,7 @@ class ProjectManagerAppointmentLogic extends BaseLogic 'start_date' => strtotime($params['start_date']), 'delivery_date' => strtotime($params['delivery_date']), 'remark' => $params['remark'], - 'annex' => $params['annex'], + 'annex' => !empty($params['annex']) ? $params['annex'] : null, ]); $processRes = ProcessApproval::create([ 'process_code' => process_code('项目经理委任'), @@ -112,7 +112,7 @@ class ProjectManagerAppointmentLogic extends BaseLogic 'start_date' => $params['start_date'], 'delivery_date' => $params['delivery_date'], 'remark' => $params['remark'], - 'annex' => $params['annex'], + 'annex' => !empty($params['annex']) ? $params['annex'] : null, ]); Db::commit(); return true; diff --git a/app/adminapi/logic/project/ProjectPlanLogic.php b/app/adminapi/logic/project/ProjectPlanLogic.php new file mode 100644 index 000000000..834e8e8ef --- /dev/null +++ b/app/adminapi/logic/project/ProjectPlanLogic.php @@ -0,0 +1,149 @@ + $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_id' => $params['project_id'], + 'project_manage' => $params['project_manage'], + 'start_time' => strtotime($params['start_time']), + 'deliver_time' => strtotime($params['deliver_time']), + 'declare_time' => strtotime($params['declare_time']), + 'remark' => $params['remark'], + 'annex' => !empty($params['annex']) ? $params['annex'] : null, + 'add_user' => $adminId, + ]); + $processRes = ProcessApproval::create([ + 'process_code' => process_code('项目计划'), + 'current_step' => $process_approval_data['current_step'], + 'action' => $process_approval_data['action'], + 'submit_step' => $process_approval_data['submit_step'], + 'check_user' => $process_approval_data['check_user'], + 'check_opinions' => $process_approval_data['check_opinions'] ?? '', + 'copy_user' => $process_approval_data['copy_user'] ?? '', + 'promoter' => $adminId, + 'schedule' => 0, + 'model' => 'ProjectPlan', + 'data_id' => $projectPlanRes->id, + ]); + ProcessApprovalLogs::create([ + 'process_id' => $processRes->id, + 'step' => $process_approval_data['current_step'], + 'action' => $process_approval_data['action'], + 'create_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 2023/12/18 11:40 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProjectPlan::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'project_manage' => $params['project_manage'], + 'start_time' => strtotime($params['start_time']), + 'deliver_time' => strtotime($params['deliver_time']), + 'declare_time' => strtotime($params['declare_time']), + 'remark' => $params['remark'], + 'annex' => !empty($params['annex']) ? $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 2023/12/18 11:40 + */ + public static function delete(array $params): bool + { + return ProjectPlan::destroy($params['id']); + } + + + /** + * @notes 获取项目计划详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public static function detail($params): array + { + $data = ProjectPlan::field('id,project_id,project_manage,start_time,deliver_time,declare_time,remark,annex')->findOrEmpty($params['id'])->toArray(); + $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id',$data['project_manage'])->findOrEmpty(); + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['project_manager_name'] = $admin['name']; + return $data; + } +} \ No newline at end of file diff --git a/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php index 8e3339f9a..c3586e774 100644 --- a/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php +++ b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php @@ -114,7 +114,7 @@ class ProjectManagerAppointmentValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','project_id','contract_id','project_type_id','project_manager','amount','project_approval_date','start_date','delivery_date']);; + return $this->only(['id','project_id','contract_id','project_type_id','project_manager','amount','project_approval_date','start_date','delivery_date','remark','annex']); } diff --git a/app/adminapi/validate/project/ProjectPlanValidate.php b/app/adminapi/validate/project/ProjectPlanValidate.php new file mode 100644 index 000000000..fbd7cdce1 --- /dev/null +++ b/app/adminapi/validate/project/ProjectPlanValidate.php @@ -0,0 +1,218 @@ + 'require', + 'org_id' => 'require|checkOrg', + 'dept_id' => 'require|checkDept', + 'project_id' => 'require|checkProject', + 'project_manage' => 'require|checkUser', + 'start_time' => 'require|date', + 'deliver_time' => 'require|date', + 'declare_time' => 'require|date', + 'process_approval' => 'require|checkProcessApproval' + ]; + + protected $message = [ + 'id.require' => '缺少必要参数', + 'org_id.require' => '请选择组织', + 'dept_id.require' => '请选择部门', + 'project_id.require' => '请选择项目', + 'project_manage.require' => '请选择项目经理', + 'start_time.require' => '请选择项目开始日期', + 'start_time.date' => '项目开始日期格式错误', + 'deliver_time.require' => '请选择项目交付日期', + 'deliver_time.date' => '项目交付日期格式错误', + 'declare_time.require' => '请选择填报日期', + 'declare_time.date' => '填报日期格式错误', + 'process_approval.require' => '请填写流程审批信息' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'org_id' => '组织id', + 'dept_id' => '部门id', + 'project_id' => '项目id', + 'project_manage' => '项目经理', + 'start_time' => '项目开始日期', + 'deliver_time' => '项目交付日期', + 'declare_time' => '填报日期', + 'add_user' => '添加人', + ]; + + + /** + * @notes 添加场景 + * @return ProjectPlanValidate + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return ProjectPlanValidate + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function sceneEdit() + { + return $this->only(['id','project_id','project_manage','start_time','deliver_time','declare_time','remark','annex']); + } + + /** + * @notes 删除场景 + * @return ProjectPlanValidate + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProjectPlanValidate + * @author likeadmin + * @date 2023/12/18 11:40 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkOrg($value): bool|string + { + $data = Orgs::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '组织不存在'; + } + return true; + } + + public function checkDept($value,$rule,$data): bool|string + { + $dept = Dept::where('id',$value)->findOrEmpty(); + if($dept->isEmpty()){ + return '部门不存在'; + } + if($data['org_id'] != $dept['org_id']){ + return '部门不属于当前选择的组织'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = Project::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目不存在'; + } + return true; + } + + public function checkUser($value): bool|string + { + $data = Admin::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '用户不存在'; + } + return true; + } + + public function checkProcessApproval($value): bool|string + { + $param = json_decode($value,true); + if(empty($param)){ + return '流程审批信息错误'; + } + if(empty($param['current_step'])){ + return '请选择当前步骤'; + }else{ + $curr_steps = DictData::where('type_value','project_plan_approval_process')->column('value'); + if(!in_array($param['current_step'],$curr_steps)){ + return '当前步骤无效'; + } + } + if(empty($param['action'])){ + return '请选择处理动作'; + }else{ + $action = DictData::where('type_value','approval_process_action')->column('value'); + if(!in_array($param['action'],$action)){ + return '处理动作无效'; + } + } + if(empty($param['submit_step'])){ + return '请选择送审步骤'; + }else{ + $submit_steps = DictData::where('type_value','project_plan_approval_process')->column('value'); + if(!in_array($param['submit_step'],$submit_steps)){ + return '送审步骤无效'; + } + } + if(empty($param['check_user'])){ + return '请指定处理人'; + }else{ + $data = Admin::where('id',$param['check_user'])->findOrEmpty(); + if($data->isEmpty()){ + return '处理人不存在'; + } + } + if(isset($param['copy_user']) || $param['copy_user'] != ''){ + $copy_user_ids = explode(',',$param['copy_user']); + foreach ($copy_user_ids as $v) { + $data = Admin::where('id',$v)->findOrEmpty(); + if($data->isEmpty()){ + return '抄送人不存在'; + } + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/project/ProjectPlan.php b/app/common/model/project/ProjectPlan.php new file mode 100644 index 000000000..e948dcd9c --- /dev/null +++ b/app/common/model/project/ProjectPlan.php @@ -0,0 +1,52 @@ +