From 11b5a694ac4a55645562d1c81718683f4517058f Mon Sep 17 00:00:00 2001 From: mzl Date: Fri, 10 Oct 2025 11:09:37 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81&&=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E5=88=86?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserGroupController.php | 60 + .../controller/UserGroupMembersController.php | 33 + app/common/controller/PresetController.php | 23 + app/common/logic/UserGroupLogic.php | 78 + app/common/logic/UserGroupMembersLogic.php | 22 + app/common/model/UserGroup.php | 56 + app/common/model/UserGroupMembers.php | 60 + app/common/service/StockOrdersService.php | 38 + .../service/UserGroupMembersService.php | 33 + app/common/service/UserGroupService.php | 124 ++ .../approval/service/ApprovalFlowService.php | 522 ++--- .../service/ApprovalFlowService_20251009.php | 1738 +++++++++++++++++ .../validate/UserGroupMembersValidate.php | 29 + app/common/validate/UserGroupValidate.php | 29 + app/controller/IndexController.php | 50 +- app/crm/controller/StockOrdersController.php | 26 + config/route.php | 13 + 17 files changed, 2648 insertions(+), 286 deletions(-) create mode 100644 app/admin/controller/UserGroupController.php create mode 100644 app/admin/controller/UserGroupMembersController.php create mode 100644 app/common/logic/UserGroupLogic.php create mode 100644 app/common/logic/UserGroupMembersLogic.php create mode 100644 app/common/model/UserGroup.php create mode 100644 app/common/model/UserGroupMembers.php create mode 100644 app/common/service/UserGroupMembersService.php create mode 100644 app/common/service/UserGroupService.php create mode 100644 app/common/utils/approval/service/ApprovalFlowService_20251009.php create mode 100644 app/common/validate/UserGroupMembersValidate.php create mode 100644 app/common/validate/UserGroupValidate.php diff --git a/app/admin/controller/UserGroupController.php b/app/admin/controller/UserGroupController.php new file mode 100644 index 0000000..8e5b586 --- /dev/null +++ b/app/admin/controller/UserGroupController.php @@ -0,0 +1,60 @@ +service = new UserGroupService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + protected function indexFormat($data) + { + if (isset($data['records']) && count($data['records']) > 0) { + foreach ($data['records'] as &$record) { + $result = [ + 'id' => $record['id'], + 'title' => $record['title'], + 'leader_id' => 0, + 'leader_name' => '', + 'sort' => $record['sort'], + 'status' => $record['status'], + 'created_at' => date('Y-m-d H:i:s', $record['created_at']), + 'updated_at' => date('Y-m-d H:i:s', $record['updated_at']) + ]; + if (isset($record['groupMembers']) && count($record['groupMembers']) > 0) { + foreach ($record['groupMembers'] as $member) { + if ($member['user'] !== null) { + $result['user'][] = [ + 'id' => $member['user']['id'], + 'name' => $member['user']['name'], + 'is_leader' => $member['is_leader'], + ]; + if ($member['is_leader'] === 1) { + $result['leader_id'] = $member['user']['id']; + $result['leader_name'] = $member['user']['name']; + } + } + } + } + $record = $result; + } + unset($record); + } + return $data; + } +} \ No newline at end of file diff --git a/app/admin/controller/UserGroupMembersController.php b/app/admin/controller/UserGroupMembersController.php new file mode 100644 index 0000000..4663bba --- /dev/null +++ b/app/admin/controller/UserGroupMembersController.php @@ -0,0 +1,33 @@ +service = new UserGroupMembersService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + // protected function indexFormat($data) + // { + // if (isset($data['created_at'])) + // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + // if (isset($data['updated_at'])) + // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + // return $data; + // } +} \ No newline at end of file diff --git a/app/common/controller/PresetController.php b/app/common/controller/PresetController.php index 1abe3de..b1c428e 100644 --- a/app/common/controller/PresetController.php +++ b/app/common/controller/PresetController.php @@ -19,6 +19,7 @@ use app\common\service\SystemsService; use app\common\service\UserService; use support\Cache; use app\common\service\PermService; +use app\common\service\UserGroupService; class PresetController extends BaseController { @@ -207,4 +208,26 @@ class PresetController extends BaseController return $this->error($e->getMessage()); } } + + + public function userGroup(Request $request) + { + try { + $result = (new UserGroupService)->userGroup($request); + return $this->success($result, '获取分组'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + + public function userGroupScene(Request $request) + { + try { + $result = (new UserGroupService)->userGroupScene($request); + return $this->success($result, '获取分组场景'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/logic/UserGroupLogic.php b/app/common/logic/UserGroupLogic.php new file mode 100644 index 0000000..006ff60 --- /dev/null +++ b/app/common/logic/UserGroupLogic.php @@ -0,0 +1,78 @@ + 0) { + foreach ($data['user_ids'] as $member) { + $this->addUserGroupMembers($member, $created->id); + } + } + if ((int)$data['leader_id'] > 0) { + $leader = UserGroupMembers::where('user_id', $data['leader_id'])->where('group_id', $created->id)->first(); + if ($leader) { + $leader->is_leader = 1; + $leader->save(); + } else { + $this->addUserGroupMembers($data['leader_id'], $created->id, 1); + } + } + return $created; + } + + + public function updateGroup(UserGroup $userGroup, array $data) + { + $userGroup->title = $data['title']; + $userGroup->sort = $data['sort'] ?? 0; + $userGroup->status = $data['status']; + $userGroup->save(); + + // 删除所有成员 + UserGroupMembers::where('group_id', $userGroup->id)->delete(); + + if (isset($data['user_ids']) && is_array($data['user_ids']) && count($data['user_ids']) > 0) { + foreach ($data['user_ids'] as $member) { + $this->addUserGroupMembers($member, $userGroup->id); + } + } + if ((int)$data['leader_id'] > 0) { + $leader = UserGroupMembers::where('user_id', $data['leader_id'])->where('group_id', $userGroup->id)->first(); + if ($leader) { + $leader->is_leader = 1; + $leader->save(); + } else { + $this->addUserGroupMembers($data['leader_id'], $userGroup->id, 1); + } + } + return $userGroup; + } + + + public function addUserGroupMembers(int $userId, int $groupId, int $isLeader = 0) + { + $udata = [ + 'user_id' => $userId, + 'group_id' => $groupId, + 'is_leader' => $isLeader + ]; + return UserGroupMembers::create($udata); + } +} \ No newline at end of file diff --git a/app/common/logic/UserGroupMembersLogic.php b/app/common/logic/UserGroupMembersLogic.php new file mode 100644 index 0000000..831c3ca --- /dev/null +++ b/app/common/logic/UserGroupMembersLogic.php @@ -0,0 +1,22 @@ +delete(); + } +} \ No newline at end of file diff --git a/app/common/model/UserGroup.php b/app/common/model/UserGroup.php new file mode 100644 index 0000000..b8f893f --- /dev/null +++ b/app/common/model/UserGroup.php @@ -0,0 +1,56 @@ +hasMany(UserGroupMembers::class, 'group_id', 'id'); + } + +} \ No newline at end of file diff --git a/app/common/model/UserGroupMembers.php b/app/common/model/UserGroupMembers.php new file mode 100644 index 0000000..7d3d57a --- /dev/null +++ b/app/common/model/UserGroupMembers.php @@ -0,0 +1,60 @@ +hasOne(User::class, 'id', 'user_id'); + } + + public function group() + { + return $this->hasOne(UserGroup::class, 'id', 'group_id'); + } +} \ No newline at end of file diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php index ee34158..3ccbdf7 100644 --- a/app/common/service/StockOrdersService.php +++ b/app/common/service/StockOrdersService.php @@ -393,6 +393,44 @@ class StockOrdersService return $this->postProcess('Approval', $item); } + /** + * 作废审批 + */ + public function serviceApprovalNullify(Request $request) + { + $config = $this->buildQueryConfig($request, 'approval'); + $item = $this->logicShow($config); + $this->approvalNullify($item); + return $this->postProcess('Approval', $item); + } + + /** + * 审批作废 + */ + public function approvalNullify($item) + { + $appro = new \app\common\utils\approval\service\ApprovalFlowService(); + $appro->startNullify('stock_orders_nullify', 'stock_orders_nullify', $item->id, [], $item->salesperson_id); + } + + /** + * 撤销审批 + */ + public function serviceApprovalRevoke(Request $request) + { + $config = $this->buildQueryConfig($request, 'approval'); + $item = $this->logicShow($config); + $this->approvalRevoke($item); + return $this->postProcess('Approval', $item); + } + + public function approvalRevoke($item) + { + $instance = \app\common\model\ApprovalInstances::where('biz_id', $item->id)->where('flow_type', 'stock_orders')->first(); + $appro = new \app\common\utils\approval\service\ApprovalFlowService(); + $appro->revoke($instance->id, $item->salesperson_id); + } + /** * 创建 * diff --git a/app/common/service/UserGroupMembersService.php b/app/common/service/UserGroupMembersService.php new file mode 100644 index 0000000..ba55b21 --- /dev/null +++ b/app/common/service/UserGroupMembersService.php @@ -0,0 +1,33 @@ +validator; + } +} \ No newline at end of file diff --git a/app/common/service/UserGroupService.php b/app/common/service/UserGroupService.php new file mode 100644 index 0000000..998b2ba --- /dev/null +++ b/app/common/service/UserGroupService.php @@ -0,0 +1,124 @@ +validator; + } + + + protected function buildQueryConfig(Request $request, string $scene = 'default'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'default': + $config['where']['status'] = 1; + $config['order']['sort'] = 'desc'; + $config['order']['id'] = 'desc'; + + $config['with'] = ['groupMembers', 'groupMembers.user']; + break; + case 'index': + $config['where']['status'] = 1; + $config['order']['sort'] = 'desc'; + $config['order']['id'] = 'desc'; + + $config['with'] = ['groupMembers', 'groupMembers.user']; + break; + case 'show': + $config['where']['id'] = $p['id']; + $config['where']['status'] = 1; + break; + case 'store': + break; + case 'update': + $config['where']['id'] = $p['id']; + break; + case 'destroy': + $config['where']['id'] = $p['id']; + break; + case 'userGroup': + $config['where']['status'] = 1; + $config['order']['sort'] = 'desc'; + $config['order']['id'] = 'desc'; + $config['fields'] = ['id', 'title']; + break; + } + + return $config; + } + + public function serviceStore(Request $request, array $data = [], string $scene = 'store') + { + $data = $this->preProcess(ucfirst($scene), $data, $request); + $created = (new UserGroupLogic())->createGroup($data); + return $this->postProcess(ucfirst($scene), $created); + } + + public function serviceUpdate(Request $request, array $data = [], string $scene = 'update') + { + $data = $this->preProcess(ucfirst($scene), $data, $request); + $config = $this->buildQueryConfig($request, $scene); + $userGroup = $this->logicShow($config); + $updated = (new UserGroupLogic())->updateGroup($userGroup, $data); + return $this->postProcess(ucfirst($scene), $updated); + } + + public function serviceDestroy(Request $request, string $scene = 'destroy') + { + $config = $this->buildQueryConfig($request, $scene); + $deleted = $this->logicDeleteBy($config); + (new UserGroupMembersLogic())->deleteUserGroupMembers($config['where']['id']); + return $this->postProcess(ucfirst($scene), $deleted); + } + + + public function userGroup(Request $request, string $scene = 'userGroup') + { + $config = $this->buildQueryConfig($request, $scene); + $result = $this->logicListAll($config); + return $this->postProcess(ucfirst($scene), $result); + } + + public function userGroupScene(Request $request, string $scene = 'userGroup') + { + $data = (new \app\common\service\SysDictService())->pluckKeyValueByCode('user_group_scene'); + $result = []; + foreach($data as $key => $value) { + $result[] = [ + 'name' => $key, + 'id' => $value, + ]; + } + return $this->postProcess(ucfirst($scene), $result); + } +} \ No newline at end of file diff --git a/app/common/utils/approval/service/ApprovalFlowService.php b/app/common/utils/approval/service/ApprovalFlowService.php index 6241057..8853913 100644 --- a/app/common/utils/approval/service/ApprovalFlowService.php +++ b/app/common/utils/approval/service/ApprovalFlowService.php @@ -164,6 +164,7 @@ class ApprovalFlowService 'finished_at' => $now, 'updated_at' => $now, ]); + $this->onFlowFinalized($instance, 'rejected'); $this->sendNotification([$instance->initiator_id], $instance, 'reject', false); return ['status' => 'completed', 'msg' => '拒绝']; } @@ -178,6 +179,7 @@ class ApprovalFlowService 'finished_at' => $now, 'updated_at' => $now, ]); + $this->onFlowFinalized($instance, 'approved'); $this->sendNotification([$instance->initiator_id], $instance, 'approve', false); return ['status' => 'completed', 'msg' => '同意']; } @@ -204,6 +206,53 @@ class ApprovalFlowService }); } + /** ★ 新增：流程完结后的业务回调（此处处理“作废”落库） */ + private function onFlowFinalized(object $instance, string $final /* 'approved'|'rejected' */): void + { + try { + switch ($instance->flow_type) { + case 'stock_orders': { + $order = \app\common\model\StockOrders::find($instance->biz_id); + if ($final === 'approved') { + $order->approval_status = 2; + $order->save(); + } elseif ($final === 'rejected') { + $order->approval_status = 3; + $order->save(); + } elseif ($final === 'revoked') { + $order->approval_status = 0; + $order->save(); + } + break; + } + + case 'stock_orders_nullify': + // 仅当作废审批“通过”时，真正把业务单置为作废 + if ($final === 'approved') { + // 这里按你的模型更新，状态字段请替换成你系统实际枚举 + $order = \app\common\model\StockOrders::find($instance->biz_id); + if ($order && $order->approval_status !== 4) { + $order->approval_status = 4; + $order->save(); + } + } + break; + + // case 'purchase_orders_nullify': + // ... + // break; + + default: + // 非作废流程，无需处理 + break; + } + } catch (\Throwable $e) { + // 避免回写异常影响审批主流程，可按需记录日志 + // logger()->error('onFlowFinalized error: '.$e->getMessage()); + } + } + + /** 撤回（仅发起人在无已处理记录前可撤回） */ public function revoke(int $instanceId, int $initiatorId, string $reason = '') { @@ -226,6 +275,8 @@ class ApprovalFlowService 'updated_at' => $now, ]); + $this->onFlowFinalized($instance, 'revoked'); + Db::table('approval_records') ->where('instance_id', $instanceId) ->where('status', 'pending') @@ -319,6 +370,8 @@ class ApprovalFlowService 'updated_at' => $now, ]); + $this->onFlowFinalized((object)$instance, $final); + Db::table('approval_records') ->where('instance_id', $instance->id) ->where('round', (int)$instance->round) @@ -365,6 +418,32 @@ class ApprovalFlowService $head = $this->getDeptHeadId((int)$val); if ($head) $ids = [(int)$head]; break; + + case 'group_members': { + // $gid = (int)($cfg['group_id'] ?? 0); + $gid = (int)($cfg['value'] ?? 0); + if ($gid <= 0) throw new BusinessException('group_members 需要 group_id'); + $ids = $this->getGroupMemberIds($gid); // A 方案 + break; + } + + case 'scenario_leader_of_initiator': { + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + // $scenario = $cfg['scenario'] ?? ($formData[$cfg['scenario_field']] ?? null); + $scenario = $val ?? ($formData[$cfg['scenario_field']] ?? null); + if (!$scenario) throw new BusinessException('缺少业务场景（scenario 或 scenario_field）'); + + $mustBelong = array_key_exists('must_belong', $cfg) ? (bool)$cfg['must_belong'] : true; + $preferPrimary = array_key_exists('prefer_primary', $cfg) ? (bool)$cfg['prefer_primary'] : true; + + $ids = $this->getLeadersByScenarioForInitiator( + (int)$instance->initiator_id, + (string)$scenario, + $mustBelong, + $preferPrimary + ); // B 方案（按场景） + break; + } default: throw new BusinessException("不支持的审批人类型: {$typ}"); } @@ -577,6 +656,17 @@ class ApprovalFlowService break; case 'stock_orders_nullify': // 备货单作废 + $stockOrder = \app\common\model\StockOrders::find($instance->biz_id); + if ($stockOrder) { + $title = $prefix."备货单作废：{$stockOrder->order_no}"; + $flowTxt = $approvalType[$instance->flow_type] ?? '备货单作废'; + $content = "{$prefix}你有一条审批 {$text}：类型 {$flowTxt}，业务单号 {$stockOrder->order_no}"; + // 把作废原因附带展示更清晰（也可依赖 $extra['note']） + $fd = json_decode($instance->form_data ?? '{}', true) ?: []; + if (!empty($fd['_nullify_reason'])) { + $content .= '；原因：'.(function_exists('mb_strimwidth') ? mb_strimwidth($fd['_nullify_reason'], 0, 120, '...', 'UTF-8') : $fd['_nullify_reason']); + } + } break; case 'purchase_orders': // 采购单 @@ -785,178 +875,6 @@ class ApprovalFlowService ]; } - /** - * 极简时间轴（含每步时间 & 申请人信息） - * - * @param int $instanceId - * @param string|null $userNameColumn 申请人姓名列（如 'name' / 'nickname'）。不需要就传 null - * @param string $initiatorPlacement 'prepend' | 'attach' - * - 'prepend'：在最前插入一条“发起申请”块（推荐） - * - 'attach' ：把申请人信息并到第一步的返回项里（不新增块） - * - * 返回：按显示顺序的数组，每项： - * { - * index:int // 步骤索引；若为“发起申请”块则为 -1 - * name:string // 步骤名或“发起申请” - * type:string // any|all 或 '-'（发起块） - * status:string // approved|rejected|processing|pending|skipped|timeout|submitted(发起块) - * started_at:?string - * finished_at:?string - * duration_seconds:?int - * // 仅发起块或 attach 时的第一步会包含： - * initiator_id?:int - * initiator_name?:?string - * } - */ - public function getSimpleTimeline2(int $instanceId, ?string $userNameColumn = null, string $initiatorPlacement = 'prepend'): array - { - // 基础数据 - $instance = Db::table('approval_instances')->where('id', $instanceId)->first(); - if (!$instance) throw new BusinessException('审批实例未找到'); - - $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); - if (!$flow) throw new BusinessException('审批流程定义未找到'); - - $steps = json_decode($flow->steps, true) ?: []; - $formData = json_decode($instance->form_data ?? '{}', true) ?: []; - $curStep = (int)$instance->current_step; - $round = (int)$instance->round; - - // 申请人 - $initiatorId = (int)$instance->initiator_id; - $initiatorName = null; - if ($userNameColumn) { - $initiatorName = Db::table('user')->where('id', $initiatorId)->value($userNameColumn); - } - - // 审批记录 - $records = Db::table('approval_records as ar') - ->where('ar.instance_id', $instanceId) - ->where('ar.round', $round) - ->orderBy('ar.step_index') - ->orderByRaw('COALESCE(ar.approved_at, ar.created_at) asc') - ->select('ar.*') - ->get() - ->toArray(); - - $byStep = []; - foreach ($records as $r) { - $idx = (int)$r->step_index; - $byStep[$idx][] = $r; - } - - $timeline = []; - - // 可选：先插入“发起申请”块（index = -1） - if ($initiatorPlacement === 'prepend') { - $appliedAt = $instance->created_at ?: null; - $timeline[] = [ - 'index' => -1, - 'name' => '发起申请', - 'type' => '-', - 'status' => 'submitted', - 'started_at' => $appliedAt, - 'finished_at' => $appliedAt, - 'duration_seconds' => 0, - 'initiator_id' => $initiatorId, - 'initiator_name' => $initiatorName, - ]; - } - - // 每一步 - foreach ($steps as $i => $meta) { - $name = $meta['name'] ?? ('Step '.$i); - $typeRaw = strtolower($meta['type'] ?? 'all'); - $type = in_array($typeRaw, ['any','all']) ? $typeRaw : 'all'; - $condStr = $meta['condition'] ?? null; - $condOk = $condStr ? $this->evaluateCondition($condStr, $formData) : true; - - $recs = $byStep[$i] ?? []; - $hasRecs = !empty($recs); - - $status = 'pending'; - $startedAt = null; - $finishedAt = null; - $durationSec = null; - - if ($hasRecs) { - // 统计时间 - $minCreated = null; - $minApproveAt = null; $maxApproveAt = null; - $minRejectAt = null; - $maxTimeoutAt = null; - $cnt = ['pending'=>0,'approved'=>0,'rejected'=>0,'timeout'=>0]; - - foreach ($recs as $rr) { - if ($rr->created_at && (!$minCreated || $rr->created_at < $minCreated)) $minCreated = $rr->created_at; - if ($rr->approved_at) { - if ($rr->status === 'approved') { - if (!$minApproveAt || $rr->approved_at < $minApproveAt) $minApproveAt = $rr->approved_at; - if (!$maxApproveAt || $rr->approved_at > $maxApproveAt) $maxApproveAt = $rr->approved_at; - } elseif ($rr->status === 'rejected') { - if (!$minRejectAt || $rr->approved_at < $minRejectAt) $minRejectAt = $rr->approved_at; - } elseif ($rr->status === 'timeout') { - if (!$maxTimeoutAt || $rr->approved_at > $maxTimeoutAt) $maxTimeoutAt = $rr->approved_at; - } - } - if (isset($cnt[$rr->status])) $cnt[$rr->status]++; - } - - $startedAt = $minCreated; - - // 总结果 - $outcome = $this->getStepOutcome($instanceId, $round, $i, $type); // 'pending'|'approve'|'reject' - if ($outcome === 'reject') { - $status = 'rejected'; - $finishedAt = $minRejectAt; - } elseif ($outcome === 'approve') { - $status = 'approved'; - $finishedAt = ($type === 'any') ? $minApproveAt : $maxApproveAt; - } else { - if ($cnt['timeout'] > 0 && $cnt['approved'] === 0 && $cnt['rejected'] === 0 && $cnt['pending'] === 0) { - $status = 'timeout'; - $finishedAt = $maxTimeoutAt; - } else { - $status = 'processing'; - } - } - - if ($startedAt && $finishedAt) { - $durationSec = max(0, strtotime($finishedAt) - strtotime($startedAt)); - } - } else { - // 无记录：根据位置与条件展示 - if ($i < $curStep) { - $status = $condOk ? 'approved' : 'skipped'; - } elseif ($i === $curStep && $instance->status === 'processing') { - $status = 'processing'; - } else { - $status = $condOk ? 'pending' : 'skipped'; - } - } - - $row = [ - 'index' => (int)$i, - 'name' => $name, - 'type' => $type, - 'status' => $status, - 'started_at' => $startedAt, - 'finished_at' => $finishedAt, - 'duration_seconds' => $durationSec, - ]; - - // 如果需要把申请人信息“并到第一步”而不是独立一块 - if ($initiatorPlacement === 'attach' && empty($timeline)) { - $row['initiator_id'] = $initiatorId; - $row['initiator_name'] = $initiatorName; - } - - $timeline[] = $row; - } - - return $timeline; - } - public function getSimpleTimeline(int $instanceId, ?string $userNameColumn = null, string $initiatorPlacement = 'prepend'): array { @@ -1520,95 +1438,6 @@ class ApprovalFlowService // ====== ====== ====== ====== ====== ====== 转交操作 ====== ====== ====== ====== ====== ====== - /** - * 转交当前待办给他人 - * 仅允许【当前这条待办的审批人】把自己名下且为 pending 的记录转交给 toUserId。 - * - 若目标人在本步已有 pending：合并（把本记录标记为 skipped，保留目标人的那条） - * - 否则：原地把该记录的 approver_id 改为 toUserId - * - 写入转交日志 - * - 通知被转交人 - */ - public function transferApproval2(int $instanceId, int $stepIndex, int $fromUserId, int $toUserId, string $reason = ''): array - { - if ($fromUserId === $toUserId) { - return ['status' => 'noop', 'msg' => '目标与来源相同，无需转交']; - } - - return Db::transaction(function () use ($instanceId, $stepIndex, $fromUserId, $toUserId, $reason) { - // 锁实例，避免并发推进 - $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); - if (!$instance) throw new BusinessException('审批实例未找到'); - if ($instance->status !== 'processing') throw new BusinessException('流程非进行中，无法转交'); - - // 锁定来源人的 pending 记录（必须是“自己名下”的记录） - $record = Db::table('approval_records') - ->where('instance_id', $instanceId) - ->where('round', (int)$instance->round) - ->where('step_index', $stepIndex) - ->where('approver_id', $fromUserId) - ->where('status', 'pending') - ->lockForUpdate() - ->first(); - - if (!$record) { - throw new BusinessException('未找到可转交的待办或已处理'); - } - - $now = date('Y-m-d H:i:s'); - - // 若目标人在本步已有 pending，合并：本记录设为 skipped，保留目标那条 - $target = Db::table('approval_records') - ->where('instance_id', $instanceId) - ->where('round', (int)$instance->round) - ->where('step_index', $stepIndex) - ->where('approver_id', $toUserId) - ->where('status', 'pending') - ->lockForUpdate() - ->first(); - - if ($target) { - Db::table('approval_records')->where('id', $record->id)->update([ - 'status' => 'skipped', - 'approved_at' => $now, - 'updated_at' => $now, - 'comment' => trim(($record->comment ?? '')."\n[转交给 {$toUserId}，目标已有待办，已合并]"), - ]); - $effectiveRecordId = (int)$target->id; - } else { - // 原地替换 approver_id - Db::table('approval_records')->where('id', $record->id)->update([ - 'approver_id' => $toUserId, - 'updated_at' => $now, - 'comment' => trim(($record->comment ?? '')."\n[自 {$fromUserId} 转交]"), - ]); - $effectiveRecordId = (int)$record->id; - } - - // 写转交日志 - Db::table('approval_transfers')->insert([ - 'instance_id' => (int)$instanceId, - 'step_index' => (int)$stepIndex, - 'record_id' => $effectiveRecordId, - 'from_user_id' => (int)$fromUserId, - 'to_user_id' => (int)$toUserId, - 'reason' => $reason, - 'created_at' => $now, - ]); - - // 通知被转交人（沿用你的 sendNotification） - $this->sendNotification([$toUserId], (object)[ - 'id' => (int)$instance->id, - 'flow_type' => (string)$instance->flow_type, - 'biz_type' => (string)$instance->biz_type, - 'biz_id' => (string)$instance->biz_id, - 'initiator_id' => (int)$instance->initiator_id, - 'form_data' => $instance->form_data, - ], 'pending', false); - - return ['status' => 'ok', 'record_id' => $effectiveRecordId]; - }); - } - /** * 查看某个实例的转交流水（按时间升序） */ @@ -1735,4 +1564,175 @@ class ApprovalFlowService }); } + + + /** ★ 新增：发起“作废审批” */ + public function startNullify( + string $voidFlowType, // 例如 'stock_orders_nullify' + string $bizType, // 原业务类型，如 'stock_orders' + string $bizId, // 原业务ID + array $formData, // 可包含 ['nullify_reason'=>...] + int $initiatorId + ): array { + return Db::transaction(function () use ($voidFlowType, $bizType, $bizId, $formData, $initiatorId) { + // 1) 流程定义校验 + $flow = Db::table('approval_flows')->where('type', $voidFlowType)->where('is_active', 1)->first(); + if (!$flow) throw new BusinessException("作废流程未找到或已停用: {$voidFlowType}"); + $steps = json_decode($flow->steps, true); + if (!is_array($steps) || empty($steps)) throw new BusinessException("作废流程步骤配置错误"); + + // 2) 必须存在“已通过”的最新有效实例（非作废流程） + $latestApproved = Db::table('approval_instances') + ->where('biz_type', $bizType) + ->where('biz_id', $bizId) + ->where('flow_type', '!=', $voidFlowType) + ->where('status', 'approved') + ->orderByDesc('id') + ->first(); + if (!$latestApproved) { + throw new BusinessException('仅已通过的单据可发起作废'); + } + + // 3) 不允许并行的作废流程 + $voidProcessing = Db::table('approval_instances') + ->where('flow_type', $voidFlowType) + ->where('biz_id', $bizId) + ->where('status', 'processing') + ->exists(); + if ($voidProcessing) { + throw new BusinessException('已存在进行中的作废审批'); + } + + // 4) 计算首步 + // 注：作废流程可以有独立条件；若不需要条件，直接第一步 + $formData = array_merge([ + '_op' => 'nullify', + '_nullify_reason' => $formData['nullify_reason'] ?? ($formData['reason'] ?? ''), + '_nullify_of_instance_id' => (int)$latestApproved->id, + ], $formData); + + $firstIndex = $this->getNextStepIndex($steps, $formData, -1); + if ($firstIndex === null) throw new BusinessException("作废流程未命中任何审批步骤"); + $firstStep = $steps[$firstIndex]; + + $now = date('Y-m-d H:i:s'); + $deadlineAt = null; + if (($flow->timeout_hours ?? 0) > 0) { + $deadlineAt = date('Y-m-d H:i:s', time() + $flow->timeout_hours * 3600); + } + + // 5) 新建作废实例（round 固定从 1 开始） + $instanceId = Db::table('approval_instances')->insertGetId([ + 'flow_type' => $voidFlowType, + 'biz_type' => $bizType, + 'biz_id' => $bizId, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'initiator_id' => $initiatorId, + 'status' => 'processing', + 'current_step' => $firstIndex, + 'round' => 1, // ★ + 'deadline_at' => $deadlineAt, + 'created_at' => $now, + 'updated_at' => $now, + ]); + + $instance = (object)[ + 'id' => $instanceId, + 'flow_type' => $voidFlowType, + 'biz_type' => $bizType, + 'biz_id' => $bizId, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'initiator_id' => $initiatorId, + 'current_step' => $firstIndex, + 'status' => 'processing', + 'round' => 1, // ★ + ]; + + // 6) 生成首步待办 + 通知（带上作废原因） + $approverIds = $this->resolveApprovers($firstStep, $instance, true); + foreach ($approverIds as $uid) { + $this->insertApprovalRecord($instance, $firstIndex, $uid); + } + $extra = []; + if (!empty($formData['_nullify_reason'])) { + $extra['note'] = '【作废原因】'.$formData['_nullify_reason']; + } + $this->sendNotification($approverIds, $instance, 'pending', false, $extra); + $this->notifyCCs($firstStep, $instance, 'pending'); + + return ['instance_id' => $instanceId]; + }); + } + + + // A) 取组内全部成员 + private function getGroupMemberIds(int $groupId): array + { + $rows = Db::table('user_group_members') + ->where('group_id', $groupId) + ->where('status', 1) + ->pluck('user_id')->toArray(); + + return array_values(array_unique(array_map('intval', $rows))); + } + + // B) 按“场景”在发起人所在的组里找负责人（支持主归属/排序兜底） + private function getLeadersByScenarioForInitiator( + int $initiatorId, + string $scenarioCode, + bool $mustBelong = true, + bool $preferPrimary = true + ): array { + // 找出“该场景下发起人所在的所有组” + $groups = Db::table('user_group as g') + ->join('user_group_members as m', 'm.group_id', '=', 'g.id') + ->where('g.scenario_code', $scenarioCode) + ->where('g.status', 1) + ->where('m.user_id', $initiatorId) + ->where('m.status', 1) + ->orderByDesc('m.is_primary') // 主归属优先 + ->orderByDesc('g.sort') // 其次按组排序 + ->select('g.id', 'm.is_primary') + ->get()->toArray(); + + if (empty($groups)) { + if ($mustBelong) { + throw new BusinessException('发起人在该业务场景下未加入任何分组'); + } + // 不强制属于：允许只按“该场景下任一组”的负责人（不推荐） + $groups = Db::table('user_group as g') + ->where('g.scenario_code', $scenarioCode) + ->where('g.status', 1) + ->orderByDesc('g.sort') + ->select('g.id', Db::raw('0 as is_primary')) + ->get()->toArray(); + if (empty($groups)) { + throw new BusinessException('该业务场景下未配置任何分组'); + } + } + + // 选择一个“目标组” + $targetGroupId = null; + if ($preferPrimary) { + foreach ($groups as $g) { + if ((int)$g->is_primary === 1) { $targetGroupId = (int)$g->id; break; } + } + } + if (!$targetGroupId) { + $targetGroupId = (int)$groups[0]->id; // 用排序第一的组 + } + + // 取负责人（可支持多负责人） + $leaders = Db::table('user_group_members') + ->where('group_id', $targetGroupId) + ->where('is_leader', 1) + ->where('status', 1) + ->pluck('user_id')->toArray(); + + $ids = array_values(array_unique(array_map('intval', $leaders))); + if (empty($ids)) throw new BusinessException('目标分组未配置负责人'); + + return $ids; + } + } \ No newline at end of file diff --git a/app/common/utils/approval/service/ApprovalFlowService_20251009.php b/app/common/utils/approval/service/ApprovalFlowService_20251009.php new file mode 100644 index 0000000..88c6a63 --- /dev/null +++ b/app/common/utils/approval/service/ApprovalFlowService_20251009.php @@ -0,0 +1,1738 @@ +where('type', $flowType)->where('is_active', 1)->first(); + if (!$flow) throw new BusinessException("审批流程未找到或已停用: {$flowType}"); + + $steps = json_decode($flow->steps, true); + if (!is_array($steps) || empty($steps)) throw new BusinessException("流程步骤配置错误"); + + // 找首个有效步骤索引（考虑条件） + $firstIndex = $this->getNextStepIndex($steps, $formData, -1); + if ($firstIndex === null) throw new BusinessException("未找到可执行的审批步骤"); + $firstStep = $steps[$firstIndex]; + + $now = date('Y-m-d H:i:s'); + $deadlineAt = null; + if (($flow->timeout_hours ?? 0) > 0) { + $deadlineAt = date('Y-m-d H:i:s', time() + $flow->timeout_hours * 3600); + } + + $instanceId = Db::table('approval_instances')->insertGetId([ + 'flow_type' => $flowType, + 'biz_type' => $bizType, + 'biz_id' => $bizId, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'initiator_id' => $initiatorId, + 'status' => 'processing', + 'current_step' => $firstIndex, + 'round' => 1, + 'deadline_at' => $deadlineAt, + 'created_at' => $now, + 'updated_at' => $now, + ]); + + $instance = (object)[ + 'id' => $instanceId, + 'flow_type' => $flowType, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'initiator_id' => $initiatorId, + 'current_step' => $firstIndex, + 'status' => 'processing', + 'flow_type' => $flowType, + 'biz_type' => $bizType, + 'biz_id' => $bizId, + 'round' => 1, + ]; + + // 解析首步审批人（支持 role_id 或 roles.name） + $approverIds = $this->resolveApprovers($firstStep, $instance, true); + foreach ($approverIds as $uid) { + $this->insertApprovalRecord($instance, $firstIndex, $uid); + } + + $extra = []; + $submitNote = $formData['submit_note'] ?? ''; + if (is_string($submitNote) && $submitNote !== '') { + $extra['note'] = $submitNote; + } + $this->sendNotification($approverIds, $instance, 'pending', false, $extra); + + $this->notifyCCs($firstStep, $instance, 'pending'); + + return ['instance_id' => $instanceId]; + }); + } + + /** 执行审批（幂等友好） */ + public function approve(int $instanceId, int $approverId, string $action, string $comment = '') + { + if (!in_array($action, ['approve','reject'], true)) { + throw new BusinessException("无效的审批操作"); + } + + return Db::transaction(function () use ($instanceId, $approverId, $action, $comment) { + $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); + if (!$instance) throw new BusinessException("审批实例未找到"); + if ($instance->status !== 'processing') { + return ['status' => 'noop', 'msg' => '实例未处理']; + } + + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) throw new BusinessException("审批流程定义未找到"); + + $steps = json_decode($flow->steps, true); + $idx = (int)$instance->current_step; + $round = (int)$instance->round; + $step = $steps[$idx] ?? null; + if (!$step) throw new BusinessException("当前步骤配置错误"); + + // 找到该用户在本步的 pending 记录（加锁） + $pendingRecord = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', $round) + ->where('approver_id', $approverId) + ->where('step_index', $idx) + ->where('status', 'pending') + ->lockForUpdate() + ->first(); + + if (!$pendingRecord) { + // 已处理过？ + $anyRecord = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', $round) + ->where('approver_id', $approverId) + ->where('step_index', $idx) + ->first(); + if ($anyRecord && $anyRecord->status !== 'pending') { + return ['status' => 'noop', 'msg' => '已处理']; + } + // 步骤已推进 + if ((int)$instance->current_step !== $idx) { + return ['status' => 'noop', 'msg' => '非当前审批']; + } + return ['status' => 'noop', 'msg' => '无待处理记录']; + } + + $now = date('Y-m-d H:i:s'); + + // 1) 更新当前人的审批记录 + Db::table('approval_records')->where('id', $pendingRecord->id)->update([ + 'action' => $action, + 'status' => ($action === 'approve') ? 'approved' : 'rejected', + 'comment' => $comment, + 'approved_at' => $now, + 'updated_at' => $now, + ]); + + // 异步审批回调 9.23 add + $approvalcallback = [ + 'biz_id' => $instance->biz_id, + 'flow_type' => $instance->flow_type, + 'instance_id' => $instance->id, + 'initiator_id' => $instance->initiator_id, + 'status' => $action + ]; + \Webman\RedisQueue\Redis::send('approval-callback', $approvalcallback); + + // 2) 聚合本步结论（any / all） + $typeRaw = strtolower($step['type'] ?? 'all'); + $type = in_array($typeRaw, ['any','all']) ? $typeRaw : 'all'; + $outcome = $this->getStepOutcome($instanceId, $round, $idx, $type); // 'pending' | 'approve' | 'reject' + + if ($outcome === 'pending') { + return ['status' => 'step_pending', 'msg' => '审批待定']; + } + + // 3) 有结论：关闭本步其余 pending + $this->closeOtherPending($instanceId, $round, $idx, [$approverId]); + + // 4) 拒绝 => 结束 + if ($outcome === 'reject') { + Db::table('approval_instances')->where('id', $instanceId)->update([ + 'status' => 'rejected', + 'finished_at' => $now, + 'updated_at' => $now, + ]); + $this->sendNotification([$instance->initiator_id], $instance, 'reject', false); + return ['status' => 'completed', 'msg' => '拒绝']; + } + + // 5) 通过 => 进入下一步或结束 + $formData = json_decode($instance->form_data, true) ?: []; + $nextIndex = $this->getNextStepIndex($steps, $formData, $idx); + + if ($nextIndex === null) { + Db::table('approval_instances')->where('id', $instanceId)->update([ + 'status' => 'approved', + 'finished_at' => $now, + 'updated_at' => $now, + ]); + $this->sendNotification([$instance->initiator_id], $instance, 'approve', false); + return ['status' => 'completed', 'msg' => '同意']; + } + + // 乐观推进 current_step + $affected = Db::table('approval_instances') + ->where('id', $instanceId) + ->where('current_step', $idx) + ->where('status', 'processing') + ->update(['current_step' => $nextIndex, 'updated_at' => $now]); + if (!$affected) { + return ['status' => 'noop', 'msg' => '并发进展']; + } + + // 生成下一步待办 + 通知 + $nextStep = $steps[$nextIndex]; + $nextApprovers = $this->resolveApprovers($nextStep, $instance, true); + foreach ($nextApprovers as $uid) { + $this->insertApprovalRecord($instance, $nextIndex, $uid); + } + $this->sendNotification($nextApprovers, $instance, 'pending', false); + $this->notifyCCs($nextStep, $instance, 'pending'); + return ['status' => 'next_step', 'msg' => '进行下一步：'.$nextStep['name'] ?? ('Step '.$nextIndex)]; + }); + } + + /** 撤回（仅发起人在无已处理记录前可撤回） */ + public function revoke(int $instanceId, int $initiatorId, string $reason = '') + { + return Db::transaction(function () use ($instanceId, $initiatorId, $reason) { + $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + if ((int)$instance->initiator_id !== (int)$initiatorId) throw new BusinessException('无权撤回'); + if ($instance->status !== 'processing') throw new BusinessException('流程已结束或不可撤回'); + + $handled = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->whereIn('status', ['approved','rejected','timeout','skipped']) + ->count() > 0; + if ($handled) throw new BusinessException('当前进度不可撤回'); + + $now = date('Y-m-d H:i:s'); + Db::table('approval_instances')->where('id', $instanceId)->update([ + 'status' => 'revoked', + 'finished_at' => $now, + 'updated_at' => $now, + ]); + + Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('status', 'pending') + ->update(['status' => 'skipped', 'approved_at' => $now, 'updated_at' => $now]); + + $this->sendNotification([$initiatorId], $instance, 'revoked', false); + return ['status' => 'completed', 'result' => 'revoked']; + }); + } + + /** 流程图数据（把 skipped/timeout 视作已完结的中性状态） */ + public function getFlowDiagramData(int $instanceId): array + { + $instance = Db::table('approval_instances')->find($instanceId); + if (!$instance) return []; + + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) return []; + + $steps = json_decode($flow->steps, true) ?: []; + $records = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', (int)$instance->round) + ->orderBy('step_index')->orderByRaw('COALESCE(approved_at, created_at) asc') + ->get() + ->groupBy('step_index'); + + $formData = json_decode($instance->form_data, true) ?: []; + $data = []; + foreach ($steps as $i => $step) { + $actions = ($records->get($i) ?? collect())->toArray(); + + if (!empty($actions)) { + $cntApproved = 0; $cntRejected = 0; $cntPending = 0; + foreach ($actions as $a) { + if ($a->status === 'approved') $cntApproved++; + elseif ($a->status === 'rejected') $cntRejected++; + elseif ($a->status === 'pending') $cntPending++; + // skipped/timeout 不阻断完结显示 + } + if ($cntRejected > 0) $status = 'rejected'; + elseif ($cntPending > 0) $status = 'processing'; + elseif ($cntApproved > 0) $status = 'approved'; + else $status = 'approved'; // 全是 skipped/timeout 也视为已过 + } else { + if ($i < (int)$instance->current_step) { + if (isset($step['condition']) && !$this->evaluateCondition($step['condition'], $formData)) { + $status = 'skipped'; + } else { + $status = 'approved'; + } + } elseif ($i === (int)$instance->current_step && $instance->status === 'processing') { + $status = 'processing'; + } else { + $status = 'pending'; + } + } + + $data[] = [ + 'index' => $i, + 'name' => $step['name'] ?? ('Step '.$i), + 'type' => $step['type'] ?? 'all', + 'status' => $status, + 'actions' => $actions, + ]; + } + return $data; + } + + /** 定时任务：处理超时（实例级） */ + public function handleTimeouts() + { + $now = date('Y-m-d H:i:s'); + $expired = Db::table('approval_instances') + ->where('status', 'processing') + ->whereNotNull('deadline_at') + ->where('deadline_at', '<=', $now) + ->get(); + + foreach ($expired as $instance) { + Db::transaction(function () use ($instance, $now) { + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) return; + + $final = ($flow->timeout_action === 'auto_approve') ? 'approved' : 'rejected'; + $finalAction = ($flow->timeout_action === 'auto_approve') ? 'approve' : 'reject'; + + Db::table('approval_instances')->where('id', $instance->id)->update([ + 'status' => $final, + 'finished_at' => $now, + 'updated_at' => $now, + ]); + + Db::table('approval_records') + ->where('instance_id', $instance->id) + ->where('round', (int)$instance->round) + ->where('step_index', $instance->current_step) + ->where('status', 'pending') + ->update(['status' => 'timeout', 'approved_at' => $now, 'updated_at' => $now]); + + $this->notifyInitiator($instance, $finalAction); + }); + } + } + + // ---------- 内部工具 ---------- + + /** 解析审批人（role/user/initiator_leader/field_user/dept_head） */ + private function resolveApprovers(array $step, object $instance, bool $avoidSelf = true): array + { + $resolved = []; + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + + $confs = $step['approvers'] ?? []; + foreach ($confs as $cfg) { + $typ = $cfg['type'] ?? ''; + $val = $cfg['value'] ?? null; + $ids = []; + + switch ($typ) { + case 'role': + $sys = isset($cfg['system_id']) ? (int)$cfg['system_id'] : null; + $includeGlobal = array_key_exists('include_global', $cfg) ? (bool)$cfg['include_global'] : true; + $ids = $this->getUserIdsByRole($val, $sys, true, $includeGlobal); + break; + case 'user': + $ids = [(int)$val]; + break; + case 'initiator_leader': + $leaderId = $this->getLeaderIdByUserId((int)$instance->initiator_id); + if ($leaderId) $ids = [(int)$leaderId]; + break; + case 'field_user': + if (isset($formData[$val])) $ids = [(int)$formData[$val]]; + break; + case 'dept_head': + $head = $this->getDeptHeadId((int)$val); + if ($head) $ids = [(int)$head]; + break; + default: + throw new BusinessException("不支持的审批人类型: {$typ}"); + } + $resolved = array_merge($resolved, $ids); + } + + $resolved = array_unique(array_filter(array_map('intval', $resolved))); + if ($avoidSelf) { + // $resolved = array_values(array_filter($resolved, fn($id) => $id !== (int)$instance->initiator_id)); + $resolved = array_values($resolved); + } + if (empty($resolved)) { + throw new BusinessException("未解析到任何审批人"); + } + return $resolved; + } + + /** 通知抄送人 */ + private function notifyCCs(array $step, object $instance, string $action = 'pending'): void + { + $ccConfig = $step['cc'] ?? []; + if (empty($ccConfig)) return; + + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + $uids = []; + + foreach ($ccConfig as $cc) { + $typ = $cc['type'] ?? ''; + $val = $cc['value'] ?? null; + + switch ($typ) { + case 'role': + $uids = array_merge($uids, $this->getUserIdsByRole($val, null, true, true)); + break; + case 'user': $uids[] = (int)$val; break; + case 'initiator_leader': + $leaderId = $this->getLeaderIdByUserId((int)$instance->initiator_id); + if ($leaderId) $uids[] = (int)$leaderId; + break; + case 'field_user': + if (isset($formData[$val])) $uids[] = (int)$formData[$val]; + break; + case 'dept_head': + $head = $this->getDeptHeadId((int)$val); + if ($head) $uids[] = (int)$head; + break; + default: break; + } + } + + $uids = array_unique(array_filter(array_map('intval', $uids))); + if (empty($uids)) return; + + $now = date('Y-m-d H:i:s'); + foreach ($uids as $uid) { + $exists = Db::table('approval_ccs') + ->where('instance_id', $instance->id) + ->where('user_id', $uid) + ->count() > 0; + if (!$exists) { + Db::table('approval_ccs')->insert([ + 'instance_id' => $instance->id, + 'user_id' => $uid, + 'notified_at' => $now, + 'created_at' => $now, + 'updated_at' => $now, + ]); + } + } + + $this->sendNotification($uids, $instance, $action, true); + } + + /** 条件求值（简单表达式） */ + private function evaluateCondition(?string $condition, array $formData): bool + { + if (!$condition) return true; + $pattern = '/^(\w+)\s*(==|!=|>|<|>=|<=)\s*(.+)$/'; + if (!preg_match($pattern, $condition, $m)) { + throw new BusinessException("条件格式错误: {$condition}"); + } + $field = $m[1]; $op = $m[2]; $value = trim($m[3], "\"'"); + $actual = $formData[$field] ?? null; + if (is_numeric($value) && is_numeric($actual)) { $value=(float)$value; $actual=(float)$actual; } + return match ($op) { + '==' => $actual == $value, + '!=' => $actual != $value, + '>' => $actual > $value, + '<' => $actual < $value, + '>=' => $actual >= $value, + '<=' => $actual <= $value, + default => throw new BusinessException("不支持的操作符: {$op}"), + }; + } + + /** 获取下一个有效步骤索引（考虑 condition） */ + private function getNextStepIndex(array $steps, array $formData, int $currentStepIndex): ?int + { + for ($i = $currentStepIndex + 1; $i < count($steps); $i++) { + $s = $steps[$i]; + if (!isset($s['condition']) || $this->evaluateCondition($s['condition'], $formData)) { + return $i; + } + } + return null; + } + + /** + * 聚合本步骤结论（按类型） + * 返回：'pending' | 'approve' | 'reject' + * + * any：有 reject => reject；否则有 approve => approve；否则 pending + * all：有 reject => reject；有 pending => pending；否则（全 approved 或 approved+skipped/timeout）=> approve + */ + private function getStepOutcome(int $instanceId, int $round, int $stepIndex, string $type): string + { + $records = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', $round) // ★ + ->where('step_index', $stepIndex) + ->get(); + + $pending = 0; $approved = 0; $rejected = 0; + foreach ($records as $r) { + if ($r->status === 'pending') $pending++; + elseif ($r->status === 'approved') $approved++; + elseif ($r->status === 'rejected') $rejected++; + } + + $type = strtolower($type); + if ($type === 'any') { + if ($rejected > 0) return 'reject'; + if ($approved > 0) return 'approve'; + return 'pending'; + } + if ($rejected > 0) return 'reject'; + if ($pending > 0) return 'pending'; + return $approved > 0 ? 'approve' : 'pending'; + } + + /** 关闭本步其余待办为 skipped */ + private function closeOtherPending(int $instanceId, int $round, int $stepIndex, array $keepApproverIds = []): void + { + $now = date('Y-m-d H:i:s'); + $q = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', $round) // ★ + ->where('step_index', $stepIndex) + ->where('status', 'pending'); + + if (!empty($keepApproverIds)) $q->whereNotIn('approver_id', $keepApproverIds); + + $q->update(['status'=>'skipped','approved_at'=>$now,'updated_at'=>$now]); + } + + /** 创建待办（去重） */ + private function insertApprovalRecord(object $instance, int $stepIndex, int $approverId): void + { + $round = (int)($instance->round ?? 1); + $now = date('Y-m-d H:i:s'); + + $exists = Db::table('approval_records') + ->where('instance_id', (int)$instance->id) + ->where('round', $round) // ★ 限当前轮 + ->where('step_index', $stepIndex) + ->where('approver_id', $approverId) + ->where('status', 'pending') + ->exists(); + + if ($exists) return; + + Db::table('approval_records')->insert([ + 'instance_id' => (int)$instance->id, + 'approver_id' => $approverId, + 'step_index' => $stepIndex, + 'round' => $round, // ★ + 'action' => null, + 'status' => 'pending', + 'comment' => null, + 'approved_at' => null, + 'created_at' => $now, + 'updated_at' => $now, + ]); + } + + /** 发送通知（支持附加文案：提交说明/申诉/讨论摘要） */ + private function sendNotification(array $userIds, object $instance, string $action, bool $isCC, array $extra = []): void + { + $map = [ + 'pending' => '待审批', + 'approve' => '已通过', + 'reject' => '已拒绝', + 'revoked' => '已撤回', + ]; + $prefix = $isCC ? '【抄送】' : '【审批】'; + $text = $map[$action] ?? $action; + + // 业务标题/内容 + $approvalType = array_flip(\app\common\service\SysDictService::pluckKeyValueByCode('approval_type')); + + switch ($instance->flow_type) { + case 'stock_orders': + // 备货单 + $stockOrder = \app\common\model\StockOrders::find($instance->biz_id); + if ($stockOrder) { + $title = $prefix."备货单：{$stockOrder->order_no}"; + $flowTxt = $approvalType[$instance->flow_type] ?? $instance->flow_type; + $content = "{$prefix}你有一条审批 {$text}：类型 {$flowTxt}，业务单号 {$stockOrder->order_no}"; + } + break; + case 'stock_orders_nullify': + // 备货单作废 + break; + case 'purchase_orders': + // 采购单 + $purchaseOrder = \app\common\model\PurchaseOrders::find($instance->biz_id); + if ($purchaseOrder) { + $title = $prefix."采购单：{$purchaseOrder->order_no}"; + $flowTxt = $approvalType[$instance->flow_type] ?? $instance->flow_type; + $content = "{$prefix}你有一条审批 {$text}：类型 {$flowTxt}，业务单号 {$purchaseOrder->order_no}"; + } + break; + case 'purchase_order': + // 采购单 + break; + } + + // 附加说明（提交说明/申诉/讨论摘要） + $append = $extra['appeal'] ?? ($extra['note'] ?? null); + if ($append) { + if (function_exists('mb_strimwidth')) { + $append = mb_strimwidth($append, 0, 120, '...', 'UTF-8'); + } + $content .= "；说明：{$append}"; + } + + noticePush([ + 'title' => $title, + 'content' => $content, + 'recipient' => $userIds, + 'email' => 1, + ]); + } + + + private function notifyInitiator(object $instance, string $result): void + { + $this->sendNotification([(int)$instance->initiator_id], $instance, $result, false); + } + + // ---------- 数据访问（roles / user_roles 结构） ---------- + + /** + * 从角色取用户ID + * @param mixed $roleIdOrName 数字 => role_id；字符串 => roles.name + * @param int|null $systemId 限定 roles.system_id；null 不限定 + * @param bool $onlyActive 仅取 status=1 角色，默认 true + * @param bool $includeGlobal 是否包含全局角色(system_id=0)，默认 true + */ + private function getUserIdsByRole($roleIdOrName, ?int $systemId = null, bool $onlyActive = true, bool $includeGlobal = true): array + { + if (is_int($roleIdOrName) || (is_string($roleIdOrName) && ctype_digit($roleIdOrName))) { + $roleId = (int)$roleIdOrName; + $needJoin = $onlyActive || !is_null($systemId) || $includeGlobal === false; + + if (!$needJoin) { + $rows = Db::table('user_roles')->where('role_id', $roleId)->select('user_id')->get(); + } else { + $q = Db::table('user_roles as ur') + ->join('roles as r', 'ur.role_id', '=', 'r.id') + ->where('ur.role_id', $roleId) + ->select('ur.user_id'); + if ($onlyActive) $q->where('r.status', 1); + if (!is_null($systemId)) { + $includeGlobal ? $q->whereIn('r.system_id', [0, $systemId]) : $q->where('r.system_id', $systemId); + } + $rows = $q->get(); + } + } else { + $name = (string)$roleIdOrName; + $q = Db::table('user_roles as ur') + ->join('roles as r', 'ur.role_id', '=', 'r.id') + ->where('r.name', $name) + ->select('ur.user_id'); + if ($onlyActive) $q->where('r.status', 1); + if (!is_null($systemId)) { + $includeGlobal ? $q->whereIn('r.system_id', [0, $systemId]) : $q->where('r.system_id', $systemId); + } + $rows = $q->get(); + } + + $ids = []; + foreach ($rows as $row) $ids[] = (int)$row->user_id; + return array_values(array_unique($ids)); + } + + private function getLeaderIdByUserId(int $userId): ?int + { + $id = Db::table('user')->where('id', $userId)->value('report_to'); + return $id ? (int)$id : null; + } + + private function getDeptHeadId(int $deptId): ?int + { + $id = Db::table('departments')->where('id', $deptId)->value('head_user_id'); + return $id ? (int)$id : null; + } + + + /** + * 查询某个审批实例的审批记录（附带步骤名/类型，可选带出审批人姓名） + * + * @param int $instanceId + * @param string|null $userNameColumn 可选：如 'name' 或 'nickname'。传 null 则不 join 用户表 + * @return array{ + * instance: array, + * steps: array, + * records: array, + * summary: array{approved:int,rejected:int,pending:int,skipped:int,timeout:int,total:int} + * } + */ + public function getInstanceRecords(int $instanceId, ?string $userNameColumn = null): array + { + // 1) 实例 + 流程步骤 + $instance = Db::table('approval_instances')->where('id', $instanceId)->first(); + if (!$instance) { + throw new BusinessException('审批实例未找到'); + } + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) { + throw new BusinessException('审批流程定义未找到'); + } + $steps = json_decode($flow->steps, true) ?: []; + + // 2) 记录查询（可选带出审批人姓名） + if ($userNameColumn) { + // 注意：确保 user 表存在该列 + $records = Db::table('approval_records as ar') + ->leftJoin('user as u', 'ar.approver_id', '=', 'u.id') + ->where('ar.instance_id', $instanceId) + ->orderBy('ar.step_index') + ->orderByRaw('COALESCE(ar.approved_at, ar.created_at) asc') + ->select( + 'ar.*', + Db::raw("u.`{$userNameColumn}` as approver_name") + ) + ->get() + ->toArray(); + } else { + $records = Db::table('approval_records as ar') + ->where('ar.instance_id', $instanceId) + ->orderBy('ar.step_index') + ->orderByRaw('COALESCE(ar.approved_at, ar.created_at) asc') + ->select('ar.*') + ->get() + ->toArray(); + } + + // 3) 附加步骤名/类型；统计汇总 + $summary = ['approved'=>0,'rejected'=>0,'pending'=>0,'skipped'=>0,'timeout'=>0,'total'=>0]; + foreach ($records as &$r) { + $idx = (int)$r->step_index; + $meta = $steps[$idx] ?? []; + $r->step_name = $meta['name'] ?? ('Step '.$idx); + $r->step_type = $meta['type'] ?? 'all'; + + if (isset($summary[$r->status])) { + $summary[$r->status]++; + } + $summary['total']++; + } + unset($r); + + return [ + 'instance' => [ + 'id' => (int)$instance->id, + 'flow_type' => $instance->flow_type, + 'biz_type' => $instance->biz_type, + 'biz_id' => $instance->biz_id, + 'status' => $instance->status, + 'current_step' => (int)$instance->current_step, + 'created_at' => $instance->created_at, + 'updated_at' => $instance->updated_at, + 'finished_at' => $instance->finished_at, + ], + 'steps' => array_map(function($s){ + return [ + 'name' => $s['name'] ?? '', + 'type' => $s['type'] ?? 'all', + 'condition' => $s['condition'] ?? null, + ]; + }, $steps), + 'records' => array_map(function($r){ + // 转成数组（Illuminate 返回的是 stdClass） + return [ + 'id' => (int)$r->id, + 'instance_id' => (int)$r->instance_id, + 'approver_id' => (int)$r->approver_id, + 'step_index' => (int)$r->step_index, + 'action' => $r->action, + 'status' => $r->status, + 'comment' => $r->comment, + 'approved_at' => $r->approved_at, + 'created_at' => $r->created_at, + 'updated_at' => $r->updated_at, + 'approver_name'=> property_exists($r, 'approver_name') ? $r->approver_name : null, + 'step_name' => $r->step_name, + 'step_type' => $r->step_type, + ]; + }, $records), + 'summary' => $summary, + ]; + } + + /** + * 极简时间轴（含每步时间 & 申请人信息） + * + * @param int $instanceId + * @param string|null $userNameColumn 申请人姓名列（如 'name' / 'nickname'）。不需要就传 null + * @param string $initiatorPlacement 'prepend' | 'attach' + * - 'prepend'：在最前插入一条“发起申请”块（推荐） + * - 'attach' ：把申请人信息并到第一步的返回项里（不新增块） + * + * 返回：按显示顺序的数组，每项： + * { + * index:int // 步骤索引；若为“发起申请”块则为 -1 + * name:string // 步骤名或“发起申请” + * type:string // any|all 或 '-'（发起块） + * status:string // approved|rejected|processing|pending|skipped|timeout|submitted(发起块) + * started_at:?string + * finished_at:?string + * duration_seconds:?int + * // 仅发起块或 attach 时的第一步会包含： + * initiator_id?:int + * initiator_name?:?string + * } + */ + public function getSimpleTimeline2(int $instanceId, ?string $userNameColumn = null, string $initiatorPlacement = 'prepend'): array + { + // 基础数据 + $instance = Db::table('approval_instances')->where('id', $instanceId)->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) throw new BusinessException('审批流程定义未找到'); + + $steps = json_decode($flow->steps, true) ?: []; + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + $curStep = (int)$instance->current_step; + $round = (int)$instance->round; + + // 申请人 + $initiatorId = (int)$instance->initiator_id; + $initiatorName = null; + if ($userNameColumn) { + $initiatorName = Db::table('user')->where('id', $initiatorId)->value($userNameColumn); + } + + // 审批记录 + $records = Db::table('approval_records as ar') + ->where('ar.instance_id', $instanceId) + ->where('ar.round', $round) + ->orderBy('ar.step_index') + ->orderByRaw('COALESCE(ar.approved_at, ar.created_at) asc') + ->select('ar.*') + ->get() + ->toArray(); + + $byStep = []; + foreach ($records as $r) { + $idx = (int)$r->step_index; + $byStep[$idx][] = $r; + } + + $timeline = []; + + // 可选：先插入“发起申请”块（index = -1） + if ($initiatorPlacement === 'prepend') { + $appliedAt = $instance->created_at ?: null; + $timeline[] = [ + 'index' => -1, + 'name' => '发起申请', + 'type' => '-', + 'status' => 'submitted', + 'started_at' => $appliedAt, + 'finished_at' => $appliedAt, + 'duration_seconds' => 0, + 'initiator_id' => $initiatorId, + 'initiator_name' => $initiatorName, + ]; + } + + // 每一步 + foreach ($steps as $i => $meta) { + $name = $meta['name'] ?? ('Step '.$i); + $typeRaw = strtolower($meta['type'] ?? 'all'); + $type = in_array($typeRaw, ['any','all']) ? $typeRaw : 'all'; + $condStr = $meta['condition'] ?? null; + $condOk = $condStr ? $this->evaluateCondition($condStr, $formData) : true; + + $recs = $byStep[$i] ?? []; + $hasRecs = !empty($recs); + + $status = 'pending'; + $startedAt = null; + $finishedAt = null; + $durationSec = null; + + if ($hasRecs) { + // 统计时间 + $minCreated = null; + $minApproveAt = null; $maxApproveAt = null; + $minRejectAt = null; + $maxTimeoutAt = null; + $cnt = ['pending'=>0,'approved'=>0,'rejected'=>0,'timeout'=>0]; + + foreach ($recs as $rr) { + if ($rr->created_at && (!$minCreated || $rr->created_at < $minCreated)) $minCreated = $rr->created_at; + if ($rr->approved_at) { + if ($rr->status === 'approved') { + if (!$minApproveAt || $rr->approved_at < $minApproveAt) $minApproveAt = $rr->approved_at; + if (!$maxApproveAt || $rr->approved_at > $maxApproveAt) $maxApproveAt = $rr->approved_at; + } elseif ($rr->status === 'rejected') { + if (!$minRejectAt || $rr->approved_at < $minRejectAt) $minRejectAt = $rr->approved_at; + } elseif ($rr->status === 'timeout') { + if (!$maxTimeoutAt || $rr->approved_at > $maxTimeoutAt) $maxTimeoutAt = $rr->approved_at; + } + } + if (isset($cnt[$rr->status])) $cnt[$rr->status]++; + } + + $startedAt = $minCreated; + + // 总结果 + $outcome = $this->getStepOutcome($instanceId, $round, $i, $type); // 'pending'|'approve'|'reject' + if ($outcome === 'reject') { + $status = 'rejected'; + $finishedAt = $minRejectAt; + } elseif ($outcome === 'approve') { + $status = 'approved'; + $finishedAt = ($type === 'any') ? $minApproveAt : $maxApproveAt; + } else { + if ($cnt['timeout'] > 0 && $cnt['approved'] === 0 && $cnt['rejected'] === 0 && $cnt['pending'] === 0) { + $status = 'timeout'; + $finishedAt = $maxTimeoutAt; + } else { + $status = 'processing'; + } + } + + if ($startedAt && $finishedAt) { + $durationSec = max(0, strtotime($finishedAt) - strtotime($startedAt)); + } + } else { + // 无记录：根据位置与条件展示 + if ($i < $curStep) { + $status = $condOk ? 'approved' : 'skipped'; + } elseif ($i === $curStep && $instance->status === 'processing') { + $status = 'processing'; + } else { + $status = $condOk ? 'pending' : 'skipped'; + } + } + + $row = [ + 'index' => (int)$i, + 'name' => $name, + 'type' => $type, + 'status' => $status, + 'started_at' => $startedAt, + 'finished_at' => $finishedAt, + 'duration_seconds' => $durationSec, + ]; + + // 如果需要把申请人信息“并到第一步”而不是独立一块 + if ($initiatorPlacement === 'attach' && empty($timeline)) { + $row['initiator_id'] = $initiatorId; + $row['initiator_name'] = $initiatorName; + } + + $timeline[] = $row; + } + + return $timeline; + } + + + public function getSimpleTimeline(int $instanceId, ?string $userNameColumn = null, string $initiatorPlacement = 'prepend'): array + { + // 基础数据 + $instance = Db::table('approval_instances')->where('id', $instanceId)->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) throw new BusinessException('审批流程定义未找到'); + + $steps = json_decode($flow->steps, true) ?: []; + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + $curStep = (int)$instance->current_step; + $round = (int)$instance->round; + + // 申请人 + $initiatorId = (int)$instance->initiator_id; + $initiatorName = null; + if ($userNameColumn) { + $initiatorName = Db::table('user')->where('id', $initiatorId)->value($userNameColumn); + } + + // 审批记录（仅当前轮次） + $records = Db::table('approval_records as ar') + ->where('ar.instance_id', $instanceId) + ->where('ar.round', $round) + ->orderBy('ar.step_index') + ->orderByRaw('COALESCE(ar.approved_at, ar.created_at) asc') + ->select('ar.*') + ->get() + ->toArray(); + + // 一次性拉取姓名，避免 N+1 + $nameMap = []; + if ($userNameColumn && !empty($records)) { + $uids = []; + foreach ($records as $r) $uids[] = (int)$r->approver_id; + $uids = array_values(array_unique($uids)); + if (!empty($uids)) { + $pairs = Db::table('user')->whereIn('id', $uids)->pluck($userNameColumn, 'id')->toArray(); + foreach ($pairs as $uid => $name) $nameMap[(int)$uid] = $name; + } + } + + // 记录分组 + $byStep = []; + foreach ($records as $r) { + $idx = (int)$r->step_index; + $byStep[$idx][] = $r; + } + + $timeline = []; + + // 可选：发起申请块 + if ($initiatorPlacement === 'prepend') { + $appliedAt = $instance->created_at ?: null; + $timeline[] = [ + 'index' => -1, + 'name' => '发起申请', + 'type' => '-', + 'status' => 'submitted', + 'started_at' => $appliedAt, + 'finished_at' => $appliedAt, + 'duration_seconds' => 0, + 'initiator_id' => $initiatorId, + 'initiator_name' => $initiatorName, + ]; + } + + // 每一步 + foreach ($steps as $i => $meta) { + $name = $meta['name'] ?? ('Step '.$i); + $typeRaw = strtolower($meta['type'] ?? 'all'); + $type = in_array($typeRaw, ['any','all']) ? $typeRaw : 'all'; + $condStr = $meta['condition'] ?? null; + $condOk = $condStr ? $this->evaluateCondition($condStr, $formData) : true; + + $recs = $byStep[$i] ?? []; + $hasRecs = !empty($recs); + + $status = 'pending'; + $startedAt = null; + $finishedAt = null; + $durationSec = null; + + // ★ 每一步的“审批意见”（只展示有内容的 comment） + $opinions = []; // [{approver_id, approver_name?, action, status, comment, time}...] + + if ($hasRecs) { + // 统计时间 + $minCreated = null; + $minApproveAt = null; $maxApproveAt = null; + $minRejectAt = null; + $maxTimeoutAt = null; + $cnt = ['pending'=>0,'approved'=>0,'rejected'=>0,'timeout'=>0]; + + foreach ($recs as $rr) { + // 收集“审批意见”（非空 comment 都算） + $cmt = trim((string)($rr->comment ?? '')); + if ($cmt !== '') { + $opinions[] = [ + 'approver_id' => (int)$rr->approver_id, + 'approver_name' => $userNameColumn ? ($nameMap[(int)$rr->approver_id] ?? null) : null, + 'action' => $rr->action, // approve | reject | null + 'status' => $rr->status, // approved|rejected|pending|skipped|timeout + 'comment' => $cmt, + 'time' => $rr->approved_at ?: $rr->created_at, + ]; + } + + if ($rr->created_at && (!$minCreated || $rr->created_at < $minCreated)) $minCreated = $rr->created_at; + if ($rr->approved_at) { + if ($rr->status === 'approved') { + if (!$minApproveAt || $rr->approved_at < $minApproveAt) $minApproveAt = $rr->approved_at; + if (!$maxApproveAt || $rr->approved_at > $maxApproveAt) $maxApproveAt = $rr->approved_at; + } elseif ($rr->status === 'rejected') { + if (!$minRejectAt || $rr->approved_at < $minRejectAt) $minRejectAt = $rr->approved_at; + } elseif ($rr->status === 'timeout') { + if (!$maxTimeoutAt || $rr->approved_at > $maxTimeoutAt) $maxTimeoutAt = $rr->approved_at; + } + } + if (isset($cnt[$rr->status])) $cnt[$rr->status]++; + } + + // 时间升序排序 opinions + if (!empty($opinions)) { + usort($opinions, function($a, $b) { + return strcmp($a['time'] ?? '', $b['time'] ?? ''); + }); + } + + $startedAt = $minCreated; + + // 总结果（注意：这里按你现在的签名调用，含 round） + $outcome = $this->getStepOutcome($instanceId, $round, $i, $type); // 'pending'|'approve'|'reject' + if ($outcome === 'reject') { + $status = 'rejected'; + $finishedAt = $minRejectAt; + } elseif ($outcome === 'approve') { + $status = 'approved'; + $finishedAt = ($type === 'any') ? $minApproveAt : $maxApproveAt; + } else { + if ($cnt['timeout'] > 0 && $cnt['approved'] === 0 && $cnt['rejected'] === 0 && $cnt['pending'] === 0) { + $status = 'timeout'; + $finishedAt = $maxTimeoutAt; + } else { + $status = 'processing'; + } + } + + if ($startedAt && $finishedAt) { + $durationSec = max(0, strtotime($finishedAt) - strtotime($startedAt)); + } + } else { + // 无记录：根据位置与条件展示 + if ($i < $curStep) { + $status = $condOk ? 'approved' : 'skipped'; + } elseif ($i === $curStep && $instance->status === 'processing') { + $status = 'processing'; + } else { + $status = $condOk ? 'pending' : 'skipped'; + } + } + + $row = [ + 'index' => (int)$i, + 'name' => $name, + 'type' => $type, + 'status' => $status, + 'started_at' => $startedAt, + 'finished_at' => $finishedAt, + 'duration_seconds' => $durationSec, + 'opinions' => $opinions, // ★ 这就是每个审批意见 + ]; + + // 把申请人信息并到第一步（可选） + if ($initiatorPlacement === 'attach' && empty($timeline)) { + $row['initiator_id'] = $initiatorId; + $row['initiator_name'] = $initiatorName; + } + + $timeline[] = $row; + } + + return $timeline; + } + + + /** + * 按业务ID获取“最新进展”的极简状态 + * - 已完结：直接返回实例最终状态 + * - 进行中：返回当前步骤（索引、名称、类型）与当前待处理审批者列表（pending） + * + * @param string $bizId + * @param string|null $bizType 可选限定业务类型 + * @param string|null $userNameColumn 可选：审批人姓名字段（如 user.name / nickname） + * @return array{ + * instance_id:int, flow_type:string, biz_type:string, biz_id:string, + * status:string, // 实例状态：approved|rejected|revoked|processing + * finished_at:?string, updated_at:?string, + * step?: array{ + * index:int, name:string, type:string, // any|all + * status:string, // processing|timeout（进行中场景） + * pending_approvers: array + * } + * } + */ + public function getBriefStatusByBiz(string $bizId, ?string $bizType = null, ?string $userNameColumn = null): array + { + // 1) 最新实例 + $q = Db::table('approval_instances')->where('biz_id', $bizId); + if ($bizType !== null && $bizType !== '') { + $q->where('biz_type', $bizType); + } + $instance = $q->orderByDesc('id')->first(); + if (!$instance) { + // throw new BusinessException('未找到对应的审批实例'); + return []; + } + + $base = [ + 'instance_id' => (int)$instance->id, + 'flow_type' => $instance->flow_type, + 'biz_type' => $instance->biz_type, + 'biz_id' => $instance->biz_id, + 'status' => $instance->status, + 'finished_at' => $instance->finished_at, + 'updated_at' => $instance->updated_at, + ]; + + // 2) 已完结：直接返回 + if ($instance->status !== 'processing') { + return $base; + } + + // 3) 进行中：取当前步骤 + 当前 pending 审批者 + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) { + // 容错：没有流程定义 + return $base; + } + $steps = json_decode($flow->steps, true) ?: []; + $idx = (int)$instance->current_step; + $round = (int)$instance->round; + $meta = $steps[$idx] ?? []; + + $typeRaw = strtolower($meta['type'] ?? 'all'); + $type = in_array($typeRaw, ['any','all']) ? $typeRaw : 'all'; + + // 当前步的所有记录 + $recsQ = Db::table('approval_records')->where('instance_id', $instance->id)->where('step_index', $idx); + + // 待处理人（只列出 pending） + if ($userNameColumn) { + $pendingRows = Db::table('approval_records as ar') + ->leftJoin('user as u', 'ar.approver_id', '=', 'u.id') + ->where('ar.instance_id', $instance->id) + ->where('ar.round', $round) + ->where('ar.step_index', $idx) + ->where('ar.status', 'pending') + ->select('ar.approver_id', Db::raw("u.`{$userNameColumn}` as approver_name")) + ->get() + ->toArray(); + } else { + $pendingRows = Db::table('approval_records') + ->where('instance_id', $instance->id) + ->where('round', $round) + ->where('step_index', $idx) + ->where('status', 'pending') + ->select('approver_id') + ->get() + ->toArray(); + } + + $pendingApprovers = []; + foreach ($pendingRows as $r) { + $row = ['approver_id' => (int)$r->approver_id]; + if ($userNameColumn && property_exists($r, 'approver_name')) { + $row['approver_name'] = $r->approver_name; + } + $pendingApprovers[] = $row; + } + + // 当前步的聚合状态（进行中通常返回 processing；若全被超时任务置为 timeout，则返回 timeout） + // 先快速统计是否纯 timeout + $stats = Db::table('approval_records') + ->where('instance_id', $instance->id) + ->where('round', $round) + ->where('step_index', $idx) + ->selectRaw("SUM(CASE WHEN status='pending' THEN 1 ELSE 0 END) as c_pending") + ->selectRaw("SUM(CASE WHEN status='approved' THEN 1 ELSE 0 END) as c_approved") + ->selectRaw("SUM(CASE WHEN status='rejected' THEN 1 ELSE 0 END) as c_rejected") + ->selectRaw("SUM(CASE WHEN status='timeout' THEN 1 ELSE 0 END) as c_timeout") + ->first(); + + $stepStatus = 'processing'; + if ($stats && (int)$stats->c_timeout > 0 && (int)$stats->c_pending === 0 && (int)$stats->c_approved === 0 && (int)$stats->c_rejected === 0) { + $stepStatus = 'timeout'; + } + + $base['step'] = [ + 'index' => $idx, + 'name' => $meta['name'] ?? ('Step '.$idx), + 'type' => $type, // any|all + 'status' => $stepStatus, // processing|timeout + 'pending_approvers' => $pendingApprovers, // 当前正在等待的审批者 + ]; + + return $base; + } + + // ====== ====== ====== ====== ====== ====== 重提操作 && 讨论 ====== ====== ====== ====== ====== ====== + + /** + * 重提交（仅对 status=rejected 的实例；支持申诉说明） + * - 合并 $patchData 到 form_data，并设置 resubmitted=1 + * - 若 $appealText 非空：form_data.appeal_last = $appealText（可用于前端展示） + * - 重新计算首个命中的步骤并创建待办；通知审批人且带上申诉说明 + */ + public function resubmit(int $instanceId, int $initiatorId, array $patchData = [], string $appealText = ''): array + { + return Db::transaction(function () use ($instanceId, $initiatorId, $patchData, $appealText) { + $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + if ((int)$instance->initiator_id !== (int)$initiatorId) throw new BusinessException('仅发起人可重提'); + if ($instance->status !== 'rejected') throw new BusinessException('仅被驳回的实例可重提'); + + $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); + if (!$flow) throw new BusinessException('审批流程定义未找到'); + + $steps = json_decode($flow->steps, true) ?: []; + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + + // 合并改动 & 打上重提标记 + $formData = array_merge($formData, $patchData); + $formData['resubmitted'] = 1; + + $appealText = trim((string)$appealText); + if ($appealText !== '') { + $formData['appeal_last'] = $appealText; + } + + // 计算重提后首个命中的步骤 + $firstIndex = $this->getNextStepIndex($steps, $formData, -1); + if ($firstIndex === null) throw new BusinessException('重提后未找到可执行的步骤'); + + $now = date('Y-m-d H:i:s'); + $deadlineAt = null; + if (($flow->timeout_hours ?? 0) > 0) { + $deadlineAt = date('Y-m-d H:i:s', time() + $flow->timeout_hours * 3600); + } + + // 清理可能遗留的 pending + Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('status', 'pending') + ->update(['status'=>'skipped','approved_at'=>$now,'updated_at'=>$now]); + + // ★ 轮次 +1 + $newRound = ((int)$instance->round) + 1; + + // 重新开启实例 + Db::table('approval_instances')->where('id', $instanceId)->update([ + 'status' => 'processing', + 'current_step' => $firstIndex, + 'round' => $newRound, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'finished_at' => null, + 'deadline_at' => $deadlineAt, + 'updated_at' => $now, + ]); + + // 创建待办 + 通知 + $firstStep = $steps[$firstIndex]; + $instanceLite = (object)[ + 'id' => (int)$instanceId, + 'flow_type' => (string)$instance->flow_type, + 'form_data' => json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'initiator_id' => (int)$instance->initiator_id, + 'biz_type' => (string)$instance->biz_type, + 'biz_id' => (string)$instance->biz_id, + 'round' => $newRound, + ]; + $approvers = $this->resolveApprovers($firstStep, $instanceLite, true); + if (empty($approvers)) throw new BusinessException('重提后首步未解析到审批人'); + + foreach ($approvers as $uid) { + $this->insertApprovalRecord($instanceLite, $firstIndex, (int)$uid); + } + + $extra = $appealText !== '' ? ['appeal' => $appealText] : []; + $this->sendNotification($approvers, $instanceLite, 'pending', false, $extra); + $this->notifyCCs($firstStep, $instanceLite, 'pending'); + + return [ + 'status' => 'resubmitted', + 'instance_id' => (int)$instanceId, + 'current_step' => $firstIndex, + 'step_name' => $firstStep['name'] ?? ('Step '.$firstIndex), + ]; + }); + } + + + /** 是否该实例参与者（发起人/任一步审批人/抄送人） */ + private function isParticipantOfInstance(int $instanceId, int $userId): bool + { + $inst = Db::table('approval_instances')->where('id', $instanceId)->first(); + if (!$inst) return false; + if ((int)$inst->initiator_id === $userId) return true; + + $inRecords = Db::table('approval_records') + ->where('instance_id', $instanceId)->where('approver_id', $userId)->exists(); + if ($inRecords) return true; + + $inCc = Db::table('approval_ccs') + ->where('instance_id', $instanceId)->where('user_id', $userId)->exists(); + return $inCc; + } + + /** 是否该实例任一步的审批人 */ + private function isApproverOfInstance(int $instanceId, int $userId): bool + { + return Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('approver_id', $userId) + ->exists(); + } + + /** 获取讨论受众：公开=全体参与者；内部=仅审批人（排除自己） */ + private function getDiscussionAudienceUserIds(int $instanceId, bool $approversOnly, int $excludeUserId): array + { + $uids = []; + if (!$approversOnly) { + $inst = Db::table('approval_instances')->where('id', $instanceId)->first(); + if ($inst) $uids[] = (int)$inst->initiator_id; + $ccs = Db::table('approval_ccs')->where('instance_id', $instanceId)->pluck('user_id')->toArray(); + foreach ($ccs as $u) $uids[] = (int)$u; + } + $approvers = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->distinct()->pluck('approver_id')->toArray(); + foreach ($approvers as $u) $uids[] = (int)$u; + + $uids = array_values(array_unique(array_filter($uids, fn($u) => $u !== $excludeUserId))); + return $uids; + } + + /** + * 发表讨论 + * @param int $instanceId + * @param int $userId + * @param string $content + * @param bool $isInternal true=仅审批人可见；false=所有参与者可见 + * @param array $attachments 可选附件数组 + * @param string|null $userNameColumn 通知里带发言人姓名（如 'name'），不需要传 null + */ + public function postDiscussion( + int $instanceId, + int $userId, + string $content, + bool $isInternal = false, + array $attachments = [], + ?string $userNameColumn = null + ): array { + $content = trim($content); + if ($content === '') throw new BusinessException('讨论内容不能为空'); + if (!$this->isParticipantOfInstance($instanceId, $userId)) { + throw new BusinessException('无权参与该实例的讨论'); + } + if ($isInternal && !$this->isApproverOfInstance($instanceId, $userId)) { + throw new BusinessException('仅审批人可发布内部讨论'); + } + + $now = date('Y-m-d H:i:s'); + $id = Db::table('approval_discussions')->insertGetId([ + 'instance_id' => $instanceId, + 'user_id' => $userId, + 'is_internal' => $isInternal ? 1 : 0, + 'content' => $content, + 'attachments' => empty($attachments) ? null : json_encode($attachments, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES), + 'created_at' => $now, + 'updated_at' => $now, + ]); + + // 通知其他人 + $inst = Db::table('approval_instances')->where('id', $instanceId)->first(); + if ($inst) { + $audience = $this->getDiscussionAudienceUserIds($instanceId, $isInternal, $userId); + // 发言人姓名（可选） + $speaker = (string)$userId; + if ($userNameColumn) { + $name = Db::table('user')->where('id', $userId)->value($userNameColumn); + if ($name) $speaker = $name; + } + $snippet = function_exists('mb_strimwidth') ? mb_strimwidth($content, 0, 80, '...', 'UTF-8') : $content; + $extra = ['note' => "【讨论】{$speaker}：{$snippet}"]; + + $this->sendNotification( + $audience, + (object)[ + 'id' => (int)$inst->id, + 'flow_type' => (string)$inst->flow_type, + 'initiator_id' => (int)$inst->initiator_id, + 'form_data' => $inst->form_data, + 'biz_type' => (string)$inst->biz_type, + 'biz_id' => (string)$inst->biz_id, + ], + 'pending', + false, + $extra + ); + } + + return [ + 'id' => (int)$id, + 'instance_id' => $instanceId, + 'user_id' => $userId, + 'is_internal' => (bool)$isInternal, + 'content' => $content, + 'attachments' => $attachments, + 'created_at' => $now, + ]; + } + + /** + * 获取讨论列表 + * @param int $instanceId + * @param int|null $afterId 翻页：取 id > afterId 的新消息 + * @param int $limit + * @param string|null $userNameColumn 带出用户名（如 'name'），不需要可传 null + */ + public function listDiscussions(int $instanceId, ?int $afterId = null, int $limit = 50, ?string $userNameColumn = null): array + { + $q = Db::table('approval_discussions as d')->where('d.instance_id', $instanceId); + if ($afterId) $q->where('d.id', '>', $afterId); + $q->orderBy('d.id', 'asc')->limit(max(1, min(200, $limit))); + + if ($userNameColumn) { + $rows = $q->leftJoin('user as u', 'd.user_id', '=', 'u.id') + ->select('d.*', Db::raw("u.`{$userNameColumn}` as user_name")) + ->get()->toArray(); + } else { + $rows = $q->select('d.*')->get()->toArray(); + } + + return array_map(function($r){ + return [ + 'id' => (int)$r->id, + 'instance_id' => (int)$r->instance_id, + 'user_id' => (int)$r->user_id, + 'is_internal' => (bool)$r->is_internal, + 'content' => $r->content, + 'attachments' => $r->attachments ? json_decode($r->attachments, true) : [], + 'created_at' => $r->created_at, + 'updated_at' => $r->updated_at, + 'user_name' => property_exists($r, 'user_name') ? $r->user_name : null, + ]; + }, $rows); + } + + // ====== ====== ====== ====== ====== ====== 转交操作 ====== ====== ====== ====== ====== ====== + + /** + * 转交当前待办给他人 + * 仅允许【当前这条待办的审批人】把自己名下且为 pending 的记录转交给 toUserId。 + * - 若目标人在本步已有 pending：合并（把本记录标记为 skipped，保留目标人的那条） + * - 否则：原地把该记录的 approver_id 改为 toUserId + * - 写入转交日志 + * - 通知被转交人 + */ + public function transferApproval2(int $instanceId, int $stepIndex, int $fromUserId, int $toUserId, string $reason = ''): array + { + if ($fromUserId === $toUserId) { + return ['status' => 'noop', 'msg' => '目标与来源相同，无需转交']; + } + + return Db::transaction(function () use ($instanceId, $stepIndex, $fromUserId, $toUserId, $reason) { + // 锁实例，避免并发推进 + $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + if ($instance->status !== 'processing') throw new BusinessException('流程非进行中，无法转交'); + + // 锁定来源人的 pending 记录（必须是“自己名下”的记录） + $record = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', (int)$instance->round) + ->where('step_index', $stepIndex) + ->where('approver_id', $fromUserId) + ->where('status', 'pending') + ->lockForUpdate() + ->first(); + + if (!$record) { + throw new BusinessException('未找到可转交的待办或已处理'); + } + + $now = date('Y-m-d H:i:s'); + + // 若目标人在本步已有 pending，合并：本记录设为 skipped，保留目标那条 + $target = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', (int)$instance->round) + ->where('step_index', $stepIndex) + ->where('approver_id', $toUserId) + ->where('status', 'pending') + ->lockForUpdate() + ->first(); + + if ($target) { + Db::table('approval_records')->where('id', $record->id)->update([ + 'status' => 'skipped', + 'approved_at' => $now, + 'updated_at' => $now, + 'comment' => trim(($record->comment ?? '')."\n[转交给 {$toUserId}，目标已有待办，已合并]"), + ]); + $effectiveRecordId = (int)$target->id; + } else { + // 原地替换 approver_id + Db::table('approval_records')->where('id', $record->id)->update([ + 'approver_id' => $toUserId, + 'updated_at' => $now, + 'comment' => trim(($record->comment ?? '')."\n[自 {$fromUserId} 转交]"), + ]); + $effectiveRecordId = (int)$record->id; + } + + // 写转交日志 + Db::table('approval_transfers')->insert([ + 'instance_id' => (int)$instanceId, + 'step_index' => (int)$stepIndex, + 'record_id' => $effectiveRecordId, + 'from_user_id' => (int)$fromUserId, + 'to_user_id' => (int)$toUserId, + 'reason' => $reason, + 'created_at' => $now, + ]); + + // 通知被转交人（沿用你的 sendNotification） + $this->sendNotification([$toUserId], (object)[ + 'id' => (int)$instance->id, + 'flow_type' => (string)$instance->flow_type, + 'biz_type' => (string)$instance->biz_type, + 'biz_id' => (string)$instance->biz_id, + 'initiator_id' => (int)$instance->initiator_id, + 'form_data' => $instance->form_data, + ], 'pending', false); + + return ['status' => 'ok', 'record_id' => $effectiveRecordId]; + }); + } + + /** + * 查看某个实例的转交流水（按时间升序） + */ + public function listTransfers(int $instanceId): array + { + $rows = Db::table('approval_transfers') + ->where('instance_id', $instanceId) + ->orderBy('id', 'asc') + ->get() + ->toArray(); + + return array_map(function($r){ + return [ + 'id' => (int)$r->id, + 'instance_id' => (int)$r->instance_id, + 'step_index' => (int)$r->step_index, + 'record_id' => (int)$r->record_id, + 'from_user_id' => (int)$r->from_user_id, + 'to_user_id' => (int)$r->to_user_id, + 'reason' => $r->reason, + 'created_at' => $r->created_at, + ]; + }, $rows); + } + + + /** + * 转交当前待办给他人（原地替换 approver_id）并在通知里追加“来源/原因” + */ + public function transferApproval( + int $instanceId, + int $stepIndex, + int $fromUserId, + int $toUserId, + string $reason = '', + ?string $userNameColumn = null // 可选：传 'name' 或 'nickname' 来展示姓名 + ): array { + if ($fromUserId === $toUserId) { + return ['status' => 'noop', 'msg' => '目标与来源相同，无需转交']; + } + + return \support\Db::transaction(function () use ($instanceId, $stepIndex, $fromUserId, $toUserId, $reason, $userNameColumn) { + // 锁实例，避免并发推进 + $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first(); + if (!$instance) throw new BusinessException('审批实例未找到'); + if ($instance->status !== 'processing') throw new BusinessException('流程非进行中，无法转交'); + + // 锁定来源人的 pending 记录 + $record = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', (int)$instance->round) + ->where('step_index', $stepIndex) + ->where('approver_id', $fromUserId) + ->where('status', 'pending') + ->lockForUpdate() + ->first(); + if (!$record) throw new BusinessException('未找到可转交的待办或已处理'); + + $now = date('Y-m-d H:i:s'); + + // 若目标已有 pending：合并（本记录置为 skipped） + $target = Db::table('approval_records') + ->where('instance_id', $instanceId) + ->where('round', (int)$instance->round) + ->where('step_index', $stepIndex) + ->where('approver_id', $toUserId) + ->where('status', 'pending') + ->lockForUpdate() + ->first(); + + if ($target) { + Db::table('approval_records')->where('id', $record->id)->update([ + 'status' => 'skipped', + 'approved_at' => $now, + 'updated_at' => $now, + 'comment' => trim(($record->comment ?? '')."\n[转交给 {$toUserId}，目标已有待办，已合并]"), + ]); + $effectiveRecordId = (int)$target->id; + } else { + // 原地替换 approver_id + Db::table('approval_records')->where('id', $record->id)->update([ + 'approver_id' => $toUserId, + 'updated_at' => $now, + 'comment' => trim(($record->comment ?? '')."\n[自 {$fromUserId} 转交]"), + ]); + $effectiveRecordId = (int)$record->id; + } + + // 组织“转交来源/原因”文案（优先姓名） + $fromLabel = (string)$fromUserId; + $toLabel = (string)$toUserId; + if ($userNameColumn) { + $fromName = Db::table('user')->where('id', $fromUserId)->value($userNameColumn); + $toName = Db::table('user')->where('id', $toUserId)->value($userNameColumn); + if ($fromName) $fromLabel = $fromName; + if ($toName) $toLabel = $toName; + } + $note = "【转交】{$fromLabel} → {$toLabel}"; + $r = trim($reason); + if ($r !== '') $note .= "，原因：{$r}"; + + // 通知被转交人（在内容里追加 note） + $this->sendNotification([$toUserId], (object)[ + 'id' => (int)$instance->id, + 'flow_type' => (string)$instance->flow_type, + 'biz_type' => (string)$instance->biz_type, + 'biz_id' => (string)$instance->biz_id, + 'initiator_id' => (int)$instance->initiator_id, + 'form_data' => $instance->form_data, + ], 'pending', false, ['note' => $note]); + + // 记转交流水 + Db::table('approval_transfers')->insert([ + 'instance_id' => (int)$instanceId, + 'step_index' => (int)$stepIndex, + 'record_id' => $effectiveRecordId, + 'from_user_id' => (int)$fromUserId, + 'to_user_id' => (int)$toUserId, + 'reason' => $reason, + 'created_at' => $now, + ]); + + return ['status' => 'ok', 'record_id' => $effectiveRecordId]; + }); + } + +} \ No newline at end of file diff --git a/app/common/validate/UserGroupMembersValidate.php b/app/common/validate/UserGroupMembersValidate.php new file mode 100644 index 0000000..3a51e50 --- /dev/null +++ b/app/common/validate/UserGroupMembersValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/common/validate/UserGroupValidate.php b/app/common/validate/UserGroupValidate.php new file mode 100644 index 0000000..2612b52 --- /dev/null +++ b/app/common/validate/UserGroupValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index a72264c..aefd8ee 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -71,32 +71,32 @@ class IndexController */ public function createResource() { - // $options = [ - // 'controller' => [ - // 'module' => 'common', - // 'name' => 'purchase_order_items' - // ], - // 'model' => [ - // 'module' => 'common', - // 'name' => 'purchase_order_items' - // ], - // 'service' => [ - // 'module' => 'common', - // 'name' => 'purchase_order_items' - // ], - // 'logic' => [ - // 'module' => 'common', - // 'name' => 'purchase_order_items' - // ], - // 'validate' => [ - // 'module' => 'common', - // 'name' => 'purchase_order_items' - // ], - // 'table' => 'purchase_order_items' - // ]; + $options = [ + 'controller' => [ + 'module' => 'common', + 'name' => 'user_group_members' + ], + 'model' => [ + 'module' => 'common', + 'name' => 'user_group_members' + ], + 'service' => [ + 'module' => 'common', + 'name' => 'user_group_members' + ], + 'logic' => [ + 'module' => 'common', + 'name' => 'user_group_members' + ], + 'validate' => [ + 'module' => 'common', + 'name' => 'user_group_members' + ], + 'table' => 'user_group_members' + ]; - // $result = (new Generate($options))->doGenerate(); - // return $result; + $result = (new Generate($options))->doGenerate(); + return $result; } diff --git a/app/crm/controller/StockOrdersController.php b/app/crm/controller/StockOrdersController.php index 77f8586..f8c03d4 100644 --- a/app/crm/controller/StockOrdersController.php +++ b/app/crm/controller/StockOrdersController.php @@ -182,6 +182,32 @@ class StockOrdersController extends BaseController } } + public function approvalNullify(Request $request) + { + try { + $raw = $this->service->serviceApprovalNullify($request); + $data = $this->transformData($raw, method_exists($this, 'approvalFormat') + ? [$this, 'approvalFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + public function approvalRevoke(Request $request) + { + try { + $raw = $this->service->serviceApprovalRevoke($request); + $data = $this->transformData($raw, method_exists($this, 'approvalFormat') + ? [$this, 'approvalFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + /** * 最终审批 */ diff --git a/config/route.php b/config/route.php index 4049182..5a6da1b 100644 --- a/config/route.php +++ b/config/route.php @@ -75,6 +75,8 @@ Route::group('/common', function () { Route::any('/port', [app\common\controller\PresetController::class, 'port']); Route::any('/color', [app\common\controller\PresetController::class, 'color']); Route::any('/modification', [app\common\controller\PresetController::class, 'modification']); + Route::any('/usergroup', [app\common\controller\PresetController::class, 'userGroup']); + Route::any('/usergroup/scene', [app\common\controller\PresetController::class, 'userGroupScene']); }); @@ -365,6 +367,15 @@ Route::group('/admin', function () { Route::any('/destroy', [app\common\controller\PurchaseOrdersController::class, 'destroy']); Route::any('/resubmit', [app\common\controller\PurchaseOrdersController::class, 'resubmit']); }); + + + Route::group('/user/group', function () { + Route::any('/list', [app\admin\controller\UserGroupController::class, 'index']); + Route::any('/show', [app\admin\controller\UserGroupController::class, 'show']); + Route::any('/store', [app\admin\controller\UserGroupController::class, 'store']); + Route::any('/update', [app\admin\controller\UserGroupController::class, 'update']); + Route::any('/destroy', [app\admin\controller\UserGroupController::class, 'destroy']); + }); }); @@ -439,6 +450,8 @@ Route::group('/crm', function () { Route::any('/approval', [app\crm\controller\StockOrdersController::class, 'approval']); Route::any('/detail', [app\crm\controller\StockOrdersController::class, 'detail']); Route::any('/ultimate/approval', [app\crm\controller\StockOrdersController::class, 'ultimateApproval']); + Route::any('/nullify/approval', [app\crm\controller\StockOrdersController::class, 'approvalNullify']); + Route::any('/revoke/approval', [app\crm\controller\StockOrdersController::class, 'approvalRevoke']); }); // 审批记录 From 009312ffa319ce379b094729bc4815cc6e87fa0f Mon Sep 17 00:00:00 2001 From: mzl Date: Sat, 11 Oct 2025 08:41:11 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=C3=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApprovalRecordsController.php | 4 +- .../controller/StockOrdersController.php | 2 +- app/admin/controller/UserGroupController.php | 1 + app/common/logic/UserGroupLogic.php | 1 + app/common/model/ApprovalInstances.php | 3 +- app/common/model/StockOrders.php | 4 + app/common/model/UserGroup.php | 2 +- app/common/service/ApprovalRecordsService.php | 9 ++ app/common/service/StockOrdersService.php | 2 +- app/common/utils/WsEvents.php | 32 +++-- .../approval/service/ApprovalFlowService.php | 131 ++++++++++++++---- app/crm/controller/StockOrdersController.php | 2 +- .../plugin/webman/gateway-worker/process.php | 4 +- config/route.php | 5 +- plugin/webman/gateway/Events.php | 1 + 15 files changed, 155 insertions(+), 48 deletions(-) diff --git a/app/admin/controller/ApprovalRecordsController.php b/app/admin/controller/ApprovalRecordsController.php index aebbaa4..d2f4b06 100644 --- a/app/admin/controller/ApprovalRecordsController.php +++ b/app/admin/controller/ApprovalRecordsController.php @@ -36,7 +36,7 @@ class ApprovalRecordsController extends BaseController 'biz_id' => $record['instance']['biz_id'], 'biz_desc' => '备货单【'.$record['instance']['bizInfo']['order_no'].'】', - 'biz_type' => $record['instance']['flow_type'], + 'biz_type' => $record['instance']['biz_type'], 'initiator_name' => $record['instance']['initiator']['name'], 'initiator_avatar' => $record['instance']['initiator']['avatar'], @@ -113,7 +113,7 @@ class ApprovalRecordsController extends BaseController 'biz_id' => $record['instance']['biz_id'], 'biz_desc' => '业务单号【'.$record['instance']['bizInfo']['order_no'].'】', - 'biz_type' => $record['instance']['flow_type'], + 'biz_type' => $record['instance']['biz_type'], 'flow_type' => $record['instance']['flow_type'], 'initiator_name' => $record['instance']['initiator']['name'], diff --git a/app/admin/controller/StockOrdersController.php b/app/admin/controller/StockOrdersController.php index 8383f52..1d854b1 100644 --- a/app/admin/controller/StockOrdersController.php +++ b/app/admin/controller/StockOrdersController.php @@ -38,7 +38,7 @@ class StockOrdersController extends BaseController if (isset($data['id'])) { $appro = new \app\common\utils\approval\service\ApprovalFlowService(); $appro = $appro->getBriefStatusByBiz($data['id'], null, 'name'); - $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回']; + $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回','voided'=>'已作废']; if ($appro) { $data['appro_status'] = [ 'status' => $appro['status'], diff --git a/app/admin/controller/UserGroupController.php b/app/admin/controller/UserGroupController.php index 8e5b586..709c6a5 100644 --- a/app/admin/controller/UserGroupController.php +++ b/app/admin/controller/UserGroupController.php @@ -29,6 +29,7 @@ class UserGroupController extends BaseController $result = [ 'id' => $record['id'], 'title' => $record['title'], + 'scenario_code' => $record['scenario_code'], 'leader_id' => 0, 'leader_name' => '', 'sort' => $record['sort'], diff --git a/app/common/logic/UserGroupLogic.php b/app/common/logic/UserGroupLogic.php index 006ff60..7ec6860 100644 --- a/app/common/logic/UserGroupLogic.php +++ b/app/common/logic/UserGroupLogic.php @@ -43,6 +43,7 @@ class UserGroupLogic $userGroup->title = $data['title']; $userGroup->sort = $data['sort'] ?? 0; $userGroup->status = $data['status']; + $userGroup->scenario_code = $data['scenario_code'] ?? ''; $userGroup->save(); // 删除所有成员 diff --git a/app/common/model/ApprovalInstances.php b/app/common/model/ApprovalInstances.php index a7a2454..e683eb4 100644 --- a/app/common/model/ApprovalInstances.php +++ b/app/common/model/ApprovalInstances.php @@ -75,6 +75,7 @@ class ApprovalInstances extends Model // ====== ====== ====== 映射业务表 ====== ====== ====== protected const BIZ_CLASS = [ 'stock_orders' => \app\common\model\StockOrders::class, + 'stock_orders_nullify' => \app\common\model\StockOrders::class, 'purchase_orders' => \app\common\model\PurchaseOrders::class, ]; @@ -85,7 +86,7 @@ class ApprovalInstances extends Model public function bizInfo() { - return $this->morphTo('bizInfo', 'biz_type', 'biz_id'); + return $this->morphTo('bizInfo', 'biz_type', 'biz_id')->withTrashed(); } // ====== ====== ====== 映射表业务 ====== ====== ====== diff --git a/app/common/model/StockOrders.php b/app/common/model/StockOrders.php index 0b97fe4..2ea6ded 100644 --- a/app/common/model/StockOrders.php +++ b/app/common/model/StockOrders.php @@ -4,9 +4,13 @@ namespace app\common\model; use support\Model; use app\common\traits\HasMoneyJournal; +use Illuminate\Database\Eloquent\SoftDeletes; class StockOrders extends Model { + + use SoftDeletes; + /** * The connection name for the model. * diff --git a/app/common/model/UserGroup.php b/app/common/model/UserGroup.php index b8f893f..02d91c0 100644 --- a/app/common/model/UserGroup.php +++ b/app/common/model/UserGroup.php @@ -40,7 +40,7 @@ class UserGroup extends Model /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'title', 'sort', 'status', 'created_at', 'updated_at']; + protected $fillable = ['id', 'title', 'scenario_code', 'sort', 'status', 'created_at', 'updated_at']; /** * 不允许自动填充模型字段 diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php index b1bc4ba..3b37365 100644 --- a/app/common/service/ApprovalRecordsService.php +++ b/app/common/service/ApprovalRecordsService.php @@ -136,6 +136,7 @@ class ApprovalRecordsService $bizInfo = []; $service = match ($data['flow_type']) { 'stock_orders' => new \app\common\service\StockOrdersService(), + 'stock_orders_nullify' => new \app\common\service\StockOrdersService(), 'purchase_orders' => new \app\common\service\PurchaseOrdersService(), default => new \app\common\service\StockOrdersService() }; @@ -154,6 +155,14 @@ class ApprovalRecordsService 'instance.bizInfo.moneyValues', 'instance.bizInfo.salesperson', ], + 'stock_orders_nullify' => [ + 'instance.bizInfo.items', + 'instance.bizInfo.items.options', + 'instance.bizInfo.items.moneyValues', + 'instance.bizInfo.accounts', + 'instance.bizInfo.moneyValues', + 'instance.bizInfo.salesperson', + ], 'purchase_orders' => [ 'instance.bizInfo.items', 'instance.bizInfo.items.stockOrder', diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php index 3ccbdf7..6eab6dd 100644 --- a/app/common/service/StockOrdersService.php +++ b/app/common/service/StockOrdersService.php @@ -410,7 +410,7 @@ class StockOrdersService public function approvalNullify($item) { $appro = new \app\common\utils\approval\service\ApprovalFlowService(); - $appro->startNullify('stock_orders_nullify', 'stock_orders_nullify', $item->id, [], $item->salesperson_id); + $appro->startNullify('stock_orders_nullify', 'stock_orders', $item->id, [], $item->salesperson_id); } /** diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php index 2a65f3e..a0f9a4c 100644 --- a/app/common/utils/WsEvents.php +++ b/app/common/utils/WsEvents.php @@ -74,16 +74,16 @@ class WsEvents } // 连接是否满足条件 - // if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { - // flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); - // Gateway::sendToClient($client_id, WsResponse::error( - // 'system.auth', - // 1001, - // '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' - // )); - // Gateway::closeClient($client_id); - // return; - // } + if (getenv('ENVIRONMENT') === 'master' && $payload['server']['HTTP_ORIGIN'] === getenv('MAIN_DOMAIN')) { + flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); + Gateway::sendToClient($client_id, WsResponse::error( + 'system.auth', + 1001, + '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' + )); + Gateway::closeClient($client_id); + return; + } // 签名检查 if (!isset($payload['get']['token'])) { @@ -99,9 +99,14 @@ class WsEvents // 解析TOKEN $user = (new Jwt())->verifyToken($payload['get']['token']); + // 绑定用户ID Gateway::bindUid($client_id, $user->uid); + // 绑定SESSION + $_SESSION['uid'] = $user->uid; + $_SESSION['name'] = $user->uname; + // 响应 Gateway::sendToClient($client_id, WsResponse::success( 'system.auth', @@ -119,6 +124,13 @@ class WsEvents } } + public function logout(string $client_id) + { + if ($_SESSION !== null) { + var_dump($_SESSION); + } + } + /** * 系统心跳 * diff --git a/app/common/utils/approval/service/ApprovalFlowService.php b/app/common/utils/approval/service/ApprovalFlowService.php index 8853913..6151002 100644 --- a/app/common/utils/approval/service/ApprovalFlowService.php +++ b/app/common/utils/approval/service/ApprovalFlowService.php @@ -3,6 +3,7 @@ namespace app\common\utils\approval\service; use support\exception\BusinessException; use support\Db; +use support\Log; class ApprovalFlowService { @@ -174,14 +175,18 @@ class ApprovalFlowService $nextIndex = $this->getNextStepIndex($steps, $formData, $idx); if ($nextIndex === null) { + $finalStatus = $this->normalizeFinalStatus((string)$instance->flow_type, 'approved'); + $notifyAction = ($finalStatus === 'voided') ? 'voided' : 'approve'; + Db::table('approval_instances')->where('id', $instanceId)->update([ - 'status' => 'approved', + 'status' => $finalStatus, 'finished_at' => $now, 'updated_at' => $now, ]); - $this->onFlowFinalized($instance, 'approved'); - $this->sendNotification([$instance->initiator_id], $instance, 'approve', false); - return ['status' => 'completed', 'msg' => '同意']; + $this->onFlowFinalized($instance, $finalStatus); + $this->sendNotification([$instance->initiator_id], $instance, $notifyAction, false); + + return ['status' => 'completed', 'msg' => ($finalStatus === 'voided' ? '已作废' : '同意')]; } // 乐观推进 current_step @@ -206,13 +211,16 @@ class ApprovalFlowService }); } - /** ★ 新增：流程完结后的业务回调（此处处理“作废”落库） */ - private function onFlowFinalized(object $instance, string $final /* 'approved'|'rejected' */): void + // 流程完结后的业务回调（approved|rejected|revoked|timeout?） + private function onFlowFinalized(object $instance, string $final): void { try { switch ($instance->flow_type) { case 'stock_orders': { $order = \app\common\model\StockOrders::find($instance->biz_id); + if (!$order) { + throw new BusinessException('订单不存在'); + } if ($final === 'approved') { $order->approval_status = 2; $order->save(); @@ -225,30 +233,27 @@ class ApprovalFlowService } break; } - case 'stock_orders_nullify': - // 仅当作废审批“通过”时，真正把业务单置为作废 if ($final === 'approved') { - // 这里按你的模型更新，状态字段请替换成你系统实际枚举 + $final = 'voided'; + Db::table('approval_instances')->where('id', $instance->id)->update([ + 'status' => 'voided', + ]); + } + if (in_array($final, ['voided','approved'], true)) { $order = \app\common\model\StockOrders::find($instance->biz_id); if ($order && $order->approval_status !== 4) { - $order->approval_status = 4; + $order->approval_status = 4; $order->save(); } } break; - - // case 'purchase_orders_nullify': - // ... - // break; - default: // 非作废流程，无需处理 break; } } catch (\Throwable $e) { - // 避免回写异常影响审批主流程，可按需记录日志 - // logger()->error('onFlowFinalized error: '.$e->getMessage()); + Log::error('onFlowFinalized error: '.$e->getMessage()); } } @@ -361,8 +366,9 @@ class ApprovalFlowService $flow = Db::table('approval_flows')->where('type', $instance->flow_type)->first(); if (!$flow) return; - $final = ($flow->timeout_action === 'auto_approve') ? 'approved' : 'rejected'; - $finalAction = ($flow->timeout_action === 'auto_approve') ? 'approve' : 'reject'; + $final = ($flow->timeout_action === 'auto_approve') ? 'approved' : 'rejected'; + $final = $this->normalizeFinalStatus((string)$instance->flow_type, $final); + $finalAction = ($final === 'voided') ? 'voided' : (($final === 'approved') ? 'approve' : 'reject'); Db::table('approval_instances')->where('id', $instance->id)->update([ 'status' => $final, @@ -490,6 +496,28 @@ class ApprovalFlowService $head = $this->getDeptHeadId((int)$val); if ($head) $uids[] = (int)$head; break; + case 'group_members': { + $gid = (int)($val ?? 0); + if ($gid <= 0) throw new BusinessException('group_members 需要 group_id'); + $uids = $this->getGroupMemberIds($gid); // A 方案 + break; + } + case 'scenario_leader_of_initiator': { + $formData = json_decode($instance->form_data ?? '{}', true) ?: []; + $scenario = $val ?? ($formData[$cc['scenario_field']] ?? null); + if (!$scenario) throw new BusinessException('缺少业务场景（scenario 或 scenario_field）'); + + $mustBelong = array_key_exists('must_belong', $cc) ? (bool)$cc['must_belong'] : true; + $preferPrimary = array_key_exists('prefer_primary', $cc) ? (bool)$cc['prefer_primary'] : true; + + $uids = $this->getLeadersByScenarioForInitiator( + (int)$instance->initiator_id, + (string)$scenario, + $mustBelong, + $preferPrimary + ); // B 方案（按场景） + break; + } default: break; } } @@ -553,10 +581,6 @@ class ApprovalFlowService /** * 聚合本步骤结论（按类型） - * 返回：'pending' | 'approve' | 'reject' - * - * any：有 reject => reject；否则有 approve => approve；否则 pending - * all：有 reject => reject；有 pending => pending；否则（全 approved 或 approved+skipped/timeout）=> approve */ private function getStepOutcome(int $instanceId, int $round, int $stepIndex, string $type): string { @@ -566,22 +590,28 @@ class ApprovalFlowService ->where('step_index', $stepIndex) ->get(); - $pending = 0; $approved = 0; $rejected = 0; + $pending = $approved = $rejected = $timeout = $skipped = 0; foreach ($records as $r) { - if ($r->status === 'pending') $pending++; - elseif ($r->status === 'approved') $approved++; - elseif ($r->status === 'rejected') $rejected++; + switch ($r->status) { + case 'pending': $pending++; break; + case 'approved': $approved++; break; + case 'rejected': $rejected++; break; + case 'timeout': $timeout++; break; + case 'skipped': $skipped++; break; + } } $type = strtolower($type); if ($type === 'any') { if ($rejected > 0) return 'reject'; if ($approved > 0) return 'approve'; + // 全为 skipped/timeout 且无 pending/rejected ⇒ 通过 + if ($pending === 0 && $rejected === 0 && $approved === 0) return 'approve'; return 'pending'; } if ($rejected > 0) return 'reject'; if ($pending > 0) return 'pending'; - return $approved > 0 ? 'approve' : 'pending'; + return 'approve'; } /** 关闭本步其余待办为 skipped */ @@ -637,6 +667,7 @@ class ApprovalFlowService 'approve' => '已通过', 'reject' => '已拒绝', 'revoked' => '已撤回', + 'voided' => '已作废', ]; $prefix = $isCC ? '【抄送】' : '【审批】'; $text = $map[$action] ?? $action; @@ -644,6 +675,10 @@ class ApprovalFlowService // 业务标题/内容 $approvalType = array_flip(\app\common\service\SysDictService::pluckKeyValueByCode('approval_type')); + $flowTxt = $approvalType[$instance->flow_type] ?? (string)$instance->flow_type; + $title = $prefix.'审批通知'; + $content = "{$prefix}你有一条审批 {$text}：类型 {$flowTxt}，业务标识 {$instance->biz_id}"; + switch ($instance->flow_type) { case 'stock_orders': // 备货单 @@ -1589,6 +1624,7 @@ class ApprovalFlowService ->where('status', 'approved') ->orderByDesc('id') ->first(); + if (!$latestApproved) { throw new BusinessException('仅已通过的单据可发起作废'); } @@ -1603,6 +1639,26 @@ class ApprovalFlowService throw new BusinessException('已存在进行中的作废审批'); } + // A. 基于历史“作废流程已通过”的实例拦截 + $voidApproved = Db::table('approval_instances') + ->where('flow_type', $voidFlowType) + ->where('biz_id', $bizId) + ->whereIn('status', ['approved','voided']) + ->exists(); + if ($voidApproved) { + throw new BusinessException('该单据已作废，无需重复作废'); + } + + // B.（可选）直接查业务表状态拦截（若你用 approval_status=4 表示已作废） + /* + $orderVoided = \app\common\model\StockOrders::where('id', $bizId) + ->where('approval_status', 4) + ->exists(); + if ($orderVoided) { + throw new BusinessException('该单据已作废，无需重复作废'); + } + */ + // 4) 计算首步 // 注：作废流程可以有独立条件；若不需要条件，直接第一步 $formData = array_merge([ @@ -1735,4 +1791,23 @@ class ApprovalFlowService return $ids; } + // + private function isNullifyFlow(string $flowType): bool + { + $t = strtolower(trim($flowType)); + return str_ends_with($t, '_nullify') || in_array($t, [ + // 所有“作废”类流程的类型 + 'stock_orders_nullify', + ], true); + } + + // 放到工具方法区 + private function normalizeFinalStatus(string $flowType, string $final): string + { + if ($this->isNullifyFlow($flowType) && $final === 'approved') { + return 'voided'; + } + return $final; + } + } \ No newline at end of file diff --git a/app/crm/controller/StockOrdersController.php b/app/crm/controller/StockOrdersController.php index f8c03d4..b297b51 100644 --- a/app/crm/controller/StockOrdersController.php +++ b/app/crm/controller/StockOrdersController.php @@ -38,7 +38,7 @@ class StockOrdersController extends BaseController if (isset($data['id'])) { $appro = new \app\common\utils\approval\service\ApprovalFlowService(); $appro = $appro->getBriefStatusByBiz($data['id'], null, 'name'); - $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回']; + $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回','voided'=>'已作废']; if ($appro) { $data['appro_status'] = [ 'status' => $appro['status'], diff --git a/config/plugin/webman/gateway-worker/process.php b/config/plugin/webman/gateway-worker/process.php index a429973..16180d9 100644 --- a/config/plugin/webman/gateway-worker/process.php +++ b/config/plugin/webman/gateway-worker/process.php @@ -8,7 +8,7 @@ return [ 'gateway' => [ 'handler' => Gateway::class, 'listen' => 'websocket://0.0.0.0:' . getenv('GATEWAY_LISTEN'), - 'count' => 2, + 'count' => 3, 'reloadable' => false, 'constructor' => ['config' => [ 'lanIp' => '127.0.0.1', @@ -22,7 +22,7 @@ return [ ], 'worker' => [ 'handler' => BusinessWorker::class, - 'count' => 6, + 'count' => 2, 'constructor' => ['config' => [ 'eventHandler' => plugin\webman\gateway\Events::class, 'name' => 'ChatBusinessWorker', diff --git a/config/route.php b/config/route.php index 5a6da1b..bcf0203 100644 --- a/config/route.php +++ b/config/route.php @@ -330,6 +330,7 @@ Route::group('/admin', function () { Route::any('/store', [app\admin\controller\StockOrdersController::class, 'store']); Route::any('/print', [app\admin\controller\StockOrdersController::class, 'print']); Route::any('/detail', [app\admin\controller\StockOrdersController::class, 'detail']); + Route::any('/destroy', [app\admin\controller\StockOrdersController::class, 'destroy']); }); // crm @@ -440,7 +441,7 @@ Route::group('/crm', function () { Route::any('/user/edit', [app\common\controller\UserController::class, 'edit']); Route::any('/user/savePassword', [app\common\controller\UserController::class, 'savePassword']); - // 基础信息 + // 备货单 Route::group('/stock/order', function () { Route::any('/list', [app\crm\controller\StockOrdersController::class, 'index']); Route::any('/show', [app\crm\controller\StockOrdersController::class, 'show']); @@ -452,6 +453,7 @@ Route::group('/crm', function () { Route::any('/ultimate/approval', [app\crm\controller\StockOrdersController::class, 'ultimateApproval']); Route::any('/nullify/approval', [app\crm\controller\StockOrdersController::class, 'approvalNullify']); Route::any('/revoke/approval', [app\crm\controller\StockOrdersController::class, 'approvalRevoke']); + Route::any('/destroy', [app\crm\controller\StockOrdersController::class, 'destroy']); }); // 审批记录 @@ -461,6 +463,7 @@ Route::group('/crm', function () { Route::any('/action', [app\crm\controller\ApprovalRecordsController::class, 'approve']); Route::any('/todo', [app\admin\controller\ApprovalRecordsController::class, 'todo']); + Route::any('/border', [app\admin\controller\ApprovalRecordsController::class, 'businessOrder']); }); // 汽车颜色 diff --git a/plugin/webman/gateway/Events.php b/plugin/webman/gateway/Events.php index d63708e..9c6573b 100644 --- a/plugin/webman/gateway/Events.php +++ b/plugin/webman/gateway/Events.php @@ -32,6 +32,7 @@ class Events public static function onClose($client_id) { + self::$wsEvents->logout($client_id); var_dump('关闭客户端ID：'.$client_id); }