调整备货单&审批

2025-09-09 16:15:48 +08:00
parent feb0512d4e
commit eb4434c139
11 changed files with 429 additions and 26 deletions
@@ -752,4 +752,269 @@ class ApprovalFlowService
            'summary' => $summary,
        ];
    }
+
+    /**
+     * 极简：审批实例的时间轴（只返回每一步的总状态）
+     *
+     * @param int $instanceId
+     * @return array<int, array{index:int,name:string,type:string,status:string}>
+     */
+    public function getSimpleTimeline1(int $instanceId): 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) ?: [];
+        $currentStep = (int)$instance->current_step;
+
+        // 读出所有记录并分组
+        $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();
+
+        $byStep = [];
+        foreach ($records as $r) {
+            $idx = (int)$r->step_index;
+            $byStep[$idx][] = $r;
+        }
+
+        $timeline = [];
+
+        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';
+
+            if ($hasRecs) {
+                // 统计是否全部 timeout（且无 approve/reject/pending）
+                $cnt = ['pending'=>0,'approved'=>0,'rejected'=>0,'timeout'=>0];
+                foreach ($recs as $rr) {
+                    if (isset($cnt[$rr->status])) $cnt[$rr->status]++;
+                }
+
+                // 用已有的聚合规则拿到结论
+                $outcome = $this->getStepOutcome($instanceId, $i, $type); // 'pending'|'approve'|'reject'
+
+                if ($outcome === 'reject') {
+                    $status = 'rejected';
+                } elseif ($outcome === 'approve') {
+                    $status = 'approved';
+                } else {
+                    // 没有结论，再看是不是纯超时
+                    if ($cnt['timeout'] > 0 && $cnt['approved'] === 0 && $cnt['rejected'] === 0 && $cnt['pending'] === 0) {
+                        $status = 'timeout';
+                    } else {
+                        $status = 'processing';
+                    }
+                }
+            } else {
+                // 无记录：根据位置与条件判断展示
+                if ($i < $currentStep) {
+                    $status = $condOk ? 'approved' : 'skipped';
+                } elseif ($i === $currentStep && $instance->status === 'processing') {
+                    // 理论上当前步应有记录；防御性展示为 processing
+                    $status = 'processing';
+                } else {
+                    $status = $condOk ? 'pending' : 'skipped';
+                }
+            }
+
+            $timeline[] = [
+                'index'  => (int)$i,
+                'name'   => $name,
+                'type'   => $type,   // any | all
+                'status' => $status, // approved | rejected | processing | pending | skipped | timeout
+            ];
+        }
+
+        return $timeline;
+    }
+
+
+    /**
+     * 极简时间轴（含每步时间 & 申请人信息）
+     *
+     * @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 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;
+
+        // 申请人
+        $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)
+            ->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, $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;
+    }
+
 }