diff --git a/app/adminapi/controller/project/ProjectAttendanceRecordController.php b/app/adminapi/controller/project/ProjectAttendanceRecordController.php index 93dd769b2..0b8565cb6 100644 --- a/app/adminapi/controller/project/ProjectAttendanceRecordController.php +++ b/app/adminapi/controller/project/ProjectAttendanceRecordController.php @@ -52,7 +52,7 @@ class ProjectAttendanceRecordController extends BaseAdminController public function add() { $params = (new ProjectAttendanceRecordValidate())->post()->goCheck('add'); - $result = ProjectAttendanceRecordLogic::add($params,$this->adminId); + $result = ProjectAttendanceRecordLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/project/ProjectManagerAppointmentController.php b/app/adminapi/controller/project/ProjectManagerAppointmentController.php index 82cad1285..ca08edcbd 100644 --- a/app/adminapi/controller/project/ProjectManagerAppointmentController.php +++ b/app/adminapi/controller/project/ProjectManagerAppointmentController.php @@ -52,7 +52,7 @@ class ProjectManagerAppointmentController extends BaseAdminController public function add() { $params = (new ProjectManagerAppointmentValidate())->post()->goCheck('add'); - $result = ProjectManagerAppointmentLogic::add($params,$this->adminId); + $result = ProjectManagerAppointmentLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php index 3fff5b7e5..610e8851e 100644 --- a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php +++ b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php @@ -20,7 +20,6 @@ use app\common\model\auth\Admin; use app\common\model\contract\Contract; use app\common\model\custom\Custom; use app\common\model\dict\DictData; -use app\common\model\process_approval\ProcessApproval; use app\common\model\project\Project; use app\common\model\project\ProjectManagerAppointment; use app\common\lists\ListsSearchInterface; @@ -66,15 +65,12 @@ class ProjectManagerAppointmentLists extends BaseAdminDataLists implements Lists ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($item){ - $process = ProcessApproval::field('process_code,submit_step')->where('model','ProjectManagerAppointment')->where('data_id',$item['id'])->findOrEmpty(); $step = DictData::where('type_value','project_manager_entrusted_approval_process')->column('name','value'); $project = Project::field('name,project_code,custom_id')->where('id',$item['project_id'])->findOrEmpty(); $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); $contract = Contract::field('contract_code')->where('id',$item['contract_id'])->findOrEmpty(); $projectType = ProjectTypeSet::field('name')->where('id',$item['project_type_id'])->findOrEmpty(); $admin = Admin::field('name')->where('id',$item['project_manager'])->findOrEmpty(); - $item['process_code'] = $process['process_code']; - $item['process_step'] = $step[$process['submit_step']]; $item['project_name'] = $project['name']; $item['project_code'] = $project['project_code']; $item['custom_name'] = $custom['name']; diff --git a/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php index 801683a99..4b979b6cc 100644 --- a/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php +++ b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php @@ -14,9 +14,6 @@ namespace app\adminapi\logic\project; - -use app\common\model\process_approval\ProcessApproval; -use app\common\model\process_approval\ProcessApprovalLogs; use app\common\model\project\Project; use app\common\model\project\ProjectAttendanceDetail; use app\common\model\project\ProjectAttendanceRecord; @@ -41,12 +38,11 @@ class ProjectAttendanceRecordLogic extends BaseLogic * @author likeadmin * @date 2023/12/26 09:44 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { Db::startTrans(); try { $attendance_detail = json_decode($params['attendance_detail'],true); - $process_approval_data = json_decode($params['process_approval'],true); $attendance_code = process_code('项目考勤记录'); $ProjectAttendanceRecordRes = ProjectAttendanceRecord::create([ 'project_id' => $params['project_id'], @@ -73,25 +69,6 @@ class ProjectAttendanceRecordLogic extends BaseLogic 'remark' => $v['work_num']??'', ]); } - $processRes = ProcessApproval::create([ - 'process_code' => $attendance_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' => $admin_id, - 'schedule' => 0, - 'model' => 'ProjectAttendanceRecord', - 'data_id' => $ProjectAttendanceRecordRes->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) { diff --git a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php index bf7c23e50..b6f0de882 100644 --- a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php +++ b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php @@ -18,8 +18,6 @@ namespace app\adminapi\logic\project; use app\common\model\auth\Admin; use app\common\model\contract\Contract; use app\common\model\custom\Custom; -use app\common\model\process_approval\ProcessApproval; -use app\common\model\process_approval\ProcessApprovalLogs; use app\common\model\project\Project; use app\common\model\project\ProjectManagerAppointment; use app\common\logic\BaseLogic; @@ -43,12 +41,11 @@ class ProjectManagerAppointmentLogic extends BaseLogic * @author likeadmin * @date 2023/12/15 15:22 */ - public static function add(array $params,$adminId): bool + public static function add(array $params): bool { Db::startTrans(); try { - $process_approval_data = json_decode($params['process_approval'],true); - $projectRes = ProjectManagerAppointment::create([ + ProjectManagerAppointment::create([ 'org_id' => $params['org_id'], 'dept_id' => $params['dept_id'], 'project_id' => $params['project_id'], @@ -62,25 +59,6 @@ class ProjectManagerAppointmentLogic extends BaseLogic 'remark' => $params['remark'], 'annex' => !empty($params['annex']) ? $params['annex'] : null, ]); - $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' => 'ProjectManagerAppointment', - 'data_id' => $projectRes->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) { diff --git a/app/adminapi/logic/project/ProjectPlanLogic.php b/app/adminapi/logic/project/ProjectPlanLogic.php index 834e8e8ef..f9fe4c006 100644 --- a/app/adminapi/logic/project/ProjectPlanLogic.php +++ b/app/adminapi/logic/project/ProjectPlanLogic.php @@ -16,8 +16,6 @@ namespace app\adminapi\logic\project; use app\common\model\auth\Admin; -use app\common\model\process_approval\ProcessApproval; -use app\common\model\process_approval\ProcessApprovalLogs; use app\common\model\project\Project; use app\common\model\project\ProjectPlan; use app\common\logic\BaseLogic; @@ -44,8 +42,7 @@ class ProjectPlanLogic extends BaseLogic { Db::startTrans(); try { - $process_approval_data = json_decode($params['process_approval'],true); - $projectPlanRes = ProjectPlan::create([ + ProjectPlan::create([ 'org_id' => $params['org_id'], 'dept_id' => $params['dept_id'], 'project_id' => $params['project_id'], @@ -57,25 +54,6 @@ class ProjectPlanLogic extends BaseLogic '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) { diff --git a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php index 8fd9e5a25..9224da02a 100644 --- a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php +++ b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php @@ -40,7 +40,6 @@ class ProjectAttendanceRecordValidate extends BaseValidate 'project_id' => 'require|checkProject', 'attendance_date' => 'require|dateFormat:Y-m-d', 'attendance_detail' => 'require|checkAttendanceDetail', - 'process_approval' => 'require|checkProcessApproval', 'file' => 'checkFile', ]; @@ -50,7 +49,6 @@ class ProjectAttendanceRecordValidate extends BaseValidate 'attendance_date.require' => '请选择考勤日期', 'attendance_date.dateFormat' => '考勤日期格式错误', 'attendance_detail.require' => '考勤记录清单信息不能为空', - 'process_approval.require' => '流程审批信息不能为空', ]; @@ -191,55 +189,4 @@ class ProjectAttendanceRecordValidate extends BaseValidate } 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_person_attendance_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_manager_entrusted_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/adminapi/validate/project/ProjectManagerAppointmentValidate.php b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php index c3586e774..edd7d970a 100644 --- a/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php +++ b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php @@ -50,7 +50,6 @@ class ProjectManagerAppointmentValidate extends BaseValidate 'project_approval_date' => 'require|date', 'start_date' => 'require|date', 'delivery_date' => 'require|date', - 'process_approval' => 'require|checkProcessApproval' ]; protected $message = [ @@ -70,7 +69,6 @@ class ProjectManagerAppointmentValidate extends BaseValidate 'start_date.date' => '项目开始日期格式错误', 'delivery_date.require' => '请选择项目交付日期', 'delivery_date.date' => '项目交付日期格式错误', - 'process_approval.require' => '请填写流程审批信息' ]; @@ -207,54 +205,4 @@ class ProjectManagerAppointmentValidate extends BaseValidate 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_manager_entrusted_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_manager_entrusted_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/adminapi/validate/project/ProjectPlanValidate.php b/app/adminapi/validate/project/ProjectPlanValidate.php index fbd7cdce1..69b261eed 100644 --- a/app/adminapi/validate/project/ProjectPlanValidate.php +++ b/app/adminapi/validate/project/ProjectPlanValidate.php @@ -44,7 +44,6 @@ class ProjectPlanValidate extends BaseValidate 'start_time' => 'require|date', 'deliver_time' => 'require|date', 'declare_time' => 'require|date', - 'process_approval' => 'require|checkProcessApproval' ]; protected $message = [ @@ -59,7 +58,6 @@ class ProjectPlanValidate extends BaseValidate 'deliver_time.date' => '项目交付日期格式错误', 'declare_time.require' => '请选择填报日期', 'declare_time.date' => '填报日期格式错误', - 'process_approval.require' => '请填写流程审批信息' ]; @@ -165,54 +163,4 @@ class ProjectPlanValidate extends BaseValidate 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/process_approval/ProcessApproval.php b/app/common/model/process_approval/ProcessApproval.php deleted file mode 100644 index f11aeeb82..000000000 --- a/app/common/model/process_approval/ProcessApproval.php +++ /dev/null @@ -1,13 +0,0 @@ -