diff --git a/DESIGN.md b/DESIGN.md
index 3758db1d..f923daa9 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -132,6 +132,7 @@ components:
- 数据口径在 Department Shell 内使用 232px 二级栏直接显示“公司组织架构”,右侧复用真实组织树和人员明细,不增加折叠层。
- 人员架构在 Department Shell 内直接复用真实组织工作面,并将组织树根节点限定为“品牌中心”。
- 素材资产库按权威组织归属选择外壳:品牌中心成员保留 Department Shell,外部普通用户只显示 64px 中性顶栏、素材工作面与退出入口。
+- 进行中项目明细采用可键盘聚焦的横向滚动数据表:桌面固定“审批单标题”首列并保留 14 项业务字段,移动端转换为同字段的语义化定义列表;节点时间在数值下方标注对应流程节点名称。
## Colors
diff --git a/PRODUCT.md b/PRODUCT.md
index d12b3ab1..6f20ad79 100644
--- a/PRODUCT.md
+++ b/PRODUCT.md
@@ -27,6 +27,8 @@ web
- 品牌中心工作台访问范围以权威人员绑定和 HR 组织路径为准;品牌中心以外的普通用户登录后只进入 `/assets/material-library`,不显示品牌中心侧栏、返回入口,也不能直接访问 `/` 或 `/workspaces/*`。系统管理员保留维护通行能力。
- “数据口径”使用独立二级栏直接进入“公司组织架构”,在品牌中心外壳内复用 `/organization` 的真实组织树、人员明细与管理员权限。
- “进行中项目”只同步两个已确认的钉钉流程类型,并只统计北京时间 2026 年 4 月 1 日起发起且尚未完结的流程;总览和所有下钻维度共用这一口径。
+- “进行中项目”项目明细按业务导出表展示审批标题、审批编号、需求人、需求部门、平台、品牌、类目、SPU、需求类型、标准时效、当前节点与负责人;需求人取流程发起人,需求部门按 HR 人员架构匹配。
+- 美术设计流程的明细开始时间取“品牌策划主管分配任务”节点创建时间,结束时间取“品牌策划主管审核”节点完成时间;内容视频流程的明细开始时间取“内容主管分配任务”节点创建时间,结束时间取“编导审核”节点完成时间。兼容上游当前使用的“内容部负责人”和“编导”节点名,但对用户统一展示确认后的业务名称。
- 美术设计申请流程的 `ding_WorkflowTask.activityId` 按已确认流程定义映射为精确中文节点名并写入本地快照;未知节点继续使用同步字段推断或明确回退,不改写上游只读数据。
- 钉钉流程快照每小时从只读报表库的 `ding_Workflow`、`ding_WorkflowTask`、`ding_WorkflowScheme` 联合增量同步,只接收已批准的美术设计申请和内容视频流程;三表复合游标写入现有同步状态并继续复用同一批生产快照数据。
- “本月上新”只读取表单字段“需求类型”为“新品”的六品牌美术设计流程,不以流程标题关键词判断,也不计“优化”等其他需求类型;分子为本月整条流程已完结数量,分母为本月已完结数量与当前进行中数量之和;其中进行中流程直接复用“进行中项目”的美术设计流程状态、时间与当前品牌中心处理人条件。
diff --git a/components/department-dashboard/CoreMetricDetail.test.tsx b/components/department-dashboard/CoreMetricDetail.test.tsx
index e210b6a5..0f8f9ed0 100644
--- a/components/department-dashboard/CoreMetricDetail.test.tsx
+++ b/components/department-dashboard/CoreMetricDetail.test.tsx
@@ -26,6 +26,18 @@ describe('CoreMetricDetail', () => {
requesterDepartment: '品牌中心',
initiatorName: '荀瑶',
initiatorDepartment: '运营中心A-事业四部-品类九部-淘系四组',
+ formFields: {
+ platform: '天猫',
+ brand: '自有品牌-亿家达',
+ category: '书桌',
+ spu: 'YJD-001',
+ demandType: '新品',
+ standardOutputDeadline: '5个工作日',
+ },
+ assignmentNodeLabel: '品牌策划主管分配任务',
+ assignmentStartedAt: '2026-08-11T02:00:00.000Z',
+ reviewNodeLabel: '品牌策划主管审核',
+ reviewFinishedAt: null,
originatorUserId: 'ding-1',
originatorDeptName: '品牌中心',
sourceCreatedAt: '2026-08-10T00:00:00.000Z',
@@ -59,6 +71,24 @@ describe('CoreMetricDetail', () => {
expect(screen.getByRole('heading', { level: 1, name: '进行中项目' })).toBeInTheDocument()
expect(screen.getAllByText('夏季主视觉过稿').length).toBeGreaterThan(0)
expect(screen.getAllByText('部门负责人审批').length).toBeGreaterThan(0)
+ expect(screen.getByRole('columnheader', { name: '审批单标题' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '审批编号' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '需求人' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '需求部门' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '平台' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '品牌' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '类目' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'SPU' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '需求类型' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '标准出图最长时效限制' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '分配任务开始时间' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '当前节点名称' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '当前节点负责人' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: '审核结束时间' })).toBeInTheDocument()
+ expect(screen.getAllByText('品牌策划主管分配任务').length).toBeGreaterThan(0)
+ expect(screen.getAllByText('品牌策划主管审核').length).toBeGreaterThan(0)
+ expect(screen.getAllByText('自有品牌-亿家达').length).toBeGreaterThan(0)
+ expect(screen.getAllByText('YJD-001').length).toBeGreaterThan(0)
expect(screen.getByText(/发起时间不早于 2026 年 4 月 1 日的未完结流程快照/)).toBeInTheDocument()
expect(screen.queryByRole('link', { name: /返回核心指标/ })).not.toBeInTheDocument()
@@ -97,6 +127,18 @@ describe('CoreMetricDetail', () => {
requesterDepartment: '品牌中心',
initiatorName: '荀瑶',
initiatorDepartment: '运营中心A-事业四部-品类九部',
+ formFields: {
+ platform: '天猫',
+ brand: '自有品牌-亿家达',
+ category: '书桌',
+ spu: 'YJD-001',
+ demandType: '新品',
+ standardOutputDeadline: '5个工作日',
+ },
+ assignmentNodeLabel: '品牌策划主管分配任务',
+ assignmentStartedAt: '2026-08-11T02:00:00.000Z',
+ reviewNodeLabel: '品牌策划主管审核',
+ reviewFinishedAt: '2026-08-12T03:00:00.000Z',
originatorUserId: 'ding-1',
originatorDeptName: '运营中心A',
sourceCreatedAt: '2026-04-20T00:00:00.000Z',
diff --git a/components/department-dashboard/OngoingProjectsInsights.tsx b/components/department-dashboard/OngoingProjectsInsights.tsx
index a926f85c..d48a03c8 100644
--- a/components/department-dashboard/OngoingProjectsInsights.tsx
+++ b/components/department-dashboard/OngoingProjectsInsights.tsx
@@ -68,6 +68,15 @@ function nodeNames(project: OngoingDingWorkflowListItem, tasks = project.activeT
return names.length > 0 ? names : ['待进入处理节点']
}
+function taskOwnerNames(tasks: OngoingDingWorkflowActiveTask[]) {
+ const names = Array.from(new Set(tasks.map((task) => task.assigneeName).filter(Boolean)))
+ return names.length > 0 ? names : ['待分配']
+}
+
+function displayValue(value: string | null | undefined) {
+ return value?.trim() || '—'
+}
+
function projectMatchesQuery(project: OngoingDingWorkflowListItem, query: string) {
const normalized = query.trim().toLocaleLowerCase('zh-CN')
if (!normalized) return true
@@ -81,10 +90,27 @@ function projectMatchesQuery(project: OngoingDingWorkflowListItem, query: string
project.requesterDepartment,
project.initiatorName,
project.initiatorDepartment,
+ project.formFields.platform,
+ project.formFields.brand,
+ project.formFields.category,
+ project.formFields.spu,
+ project.formFields.demandType,
+ project.formFields.standardOutputDeadline,
+ project.assignmentNodeLabel,
+ project.reviewNodeLabel,
...project.activeTasks.flatMap((task) => [task.assigneeName, task.nodeName, task.taskId]),
].some((value) => String(value || '').toLocaleLowerCase('zh-CN').includes(normalized))
}
+function MilestoneTime({ label, value }: { label: string; value: string | null }) {
+ return (
+
+
{formatDate(value)}
+
{label}
+
+ )
+}
+
function CurrentTaskSummary({
project,
tasks = project.activeTasks,
@@ -507,7 +533,7 @@ export default function OngoingProjectsInsights({ insights }: { insights: Ongoin
项目明细
- 当前筛选 {filteredProjects.length} 个项目;展示任务编号、发起人、当前节点处理人和日期。
+ 当前筛选 {filteredProjects.length} 个项目;字段与业务流程明细表一致,需求部门按发起人人员架构匹配。
@@ -518,7 +544,7 @@ export default function OngoingProjectsInsights({ insights }: { insights: Ongoin
id="ongoing-project-search"
type="search"
value={query}
- placeholder="搜索任务编号、品牌、发起人、节点或处理人"
+ placeholder="搜索标题、审批编号、平台、品牌、SPU、发起人、节点或处理人"
className="min-h-11 w-full rounded-lg border border-slate-300 bg-white py-2 pl-9 pr-3 text-sm text-slate-950 outline-none placeholder:text-slate-400 focus:border-[#1677ff] focus:ring-2 focus:ring-blue-100"
onChange={(event) => {
setQuery(event.target.value)
@@ -552,39 +578,57 @@ export default function OngoingProjectsInsights({ insights }: { insights: Ongoin
) : (
<>
-
-
- 进行中项目任务明细
-
+
+
+ 进行中项目流程明细,包含审批表单字段、当前节点与流程里程碑时间
+
- | 项目 / 任务编号 |
- 品牌 |
- 任务类型 |
- 发起人 / 所在部门 |
- 当前节点 / 处理人 |
- 发起 / 更新 |
+ 审批单标题 |
+ 审批编号 |
+ 需求人 |
+ 需求部门 |
+ 平台 |
+ 品牌 |
+ 类目 |
+ SPU |
+ 需求类型 |
+ 标准出图最长时效限制 |
+ 分配任务开始时间 |
+ 当前节点名称 |
+ 当前节点负责人 |
+ 审核结束时间 |
- {displayedProjects.map((project) => (
-
- |
+ {displayedProjects.map((project) => {
+ const tasks = tasksForSelectedOwner(project)
+ return (
+ |
+ |
{project.title}
- {project.businessId || project.id}
- |
- {project.brand} |
- {project.projectType} |
-
- {project.initiatorName}
- {project.initiatorDepartment}
- |
- |
-
- {formatDate(project.sourceCreatedAt)}
- 更新 {formatDate(project.sourceUpdatedAt)}
+ {project.projectType}
|
+ {project.businessId || project.id} |
+ {displayValue(project.initiatorName)} |
+ {displayValue(project.initiatorDepartment)} |
+ {displayValue(project.formFields.platform)} |
+ {displayValue(project.formFields.brand || project.brand)} |
+ {displayValue(project.formFields.category)} |
+ {displayValue(project.formFields.spu)} |
+ {displayValue(project.formFields.demandType)} |
+ {displayValue(project.formFields.standardOutputDeadline)} |
+ |
+ {nodeNames(project, tasks).join(' / ')} |
+ {taskOwnerNames(tasks).join(' / ')} |
+ |
- ))}
+ )
+ })}
@@ -595,17 +639,23 @@ export default function OngoingProjectsInsights({ insights }: { insights: Ongoin
{project.title}
-
任务编号 {project.businessId || project.id}
+
审批编号 {project.businessId || project.id}
-
{project.brand}
+
{project.projectType}
-
- - 任务类型
- {project.projectType}
- - 发起人
- {project.initiatorName}
- - 所在部门
- {project.initiatorDepartment}
- - 当前节点 / 处理人
- - 发起时间
- {formatDate(project.sourceCreatedAt)}
- - 最近更新
- {formatDate(project.sourceUpdatedAt)}
+
+ - 需求人
- {displayValue(project.initiatorName)}
+ - 需求部门
- {displayValue(project.initiatorDepartment)}
+ - 平台
- {displayValue(project.formFields.platform)}
+ - 品牌
- {displayValue(project.formFields.brand || project.brand)}
+ - 类目
- {displayValue(project.formFields.category)}
+ - SPU
- {displayValue(project.formFields.spu)}
+ - 需求类型
- {displayValue(project.formFields.demandType)}
+ - 标准出图最长时效限制
- {displayValue(project.formFields.standardOutputDeadline)}
+ - 分配任务开始时间
+ - 当前节点名称
- {nodeNames(project, tasksForSelectedOwner(project)).join(' / ')}
+ - 当前节点负责人
- {taskOwnerNames(tasksForSelectedOwner(project)).join(' / ')}
+ - 审核结束时间
))}
diff --git a/lib/__tests__/ding-workflow-sync.test.ts b/lib/__tests__/ding-workflow-sync.test.ts
index b21769a9..86e1d77e 100644
--- a/lib/__tests__/ding-workflow-sync.test.ts
+++ b/lib/__tests__/ding-workflow-sync.test.ts
@@ -16,9 +16,11 @@ import {
isDingWorkflowCompletedInRange,
normalizeDingWorkflowBrand,
normalizeDingWorkflowDepartment,
+ normalizeDingWorkflowDetailValue,
normalizeDingWorkflowProcessCode,
parseDingWorkflowSourceCursor,
resolveDingWorkflowInitiator,
+ resolveDingWorkflowDetailMilestones,
serializeDingWorkflowSourceCursor,
sourceWorkflowTimestampToIso,
} from '@/lib/ding-workflow-sync'
@@ -216,6 +218,47 @@ describe('ding workflow snapshot sync semantics', () => {
expect(normalizeDingWorkflowDepartment(null)).toBeNull()
})
+ it('normalizes scalar, array and contact-shaped detail form values', () => {
+ expect(normalizeDingWorkflowDetailValue('天猫')).toBe('天猫')
+ expect(normalizeDingWorkflowDetailValue('["书桌","书柜"]')).toBe('书桌 / 书柜')
+ expect(normalizeDingWorkflowDetailValue([{ name: '亿家达' }, { name: '亿家达' }])).toBe('亿家达')
+ expect(normalizeDingWorkflowDetailValue(null)).toBeNull()
+ })
+
+ it('uses the confirmed art and content-video milestone definitions', () => {
+ const tasks = [
+ {
+ taskId: 'task-1', activityId: 'art-start', nodeName: '品牌策划主管分配任务',
+ assigneeUserId: 'user-1', assigneeName: '甲', assigneeDepartment: '品牌中心',
+ isBrandCenter: true, isLeadership: false, isActive: false, reviewPassed: true,
+ result: 'AGREE', createdAt: '2026-08-01T01:00:00.000Z', finishedAt: '2026-08-01T02:00:00.000Z',
+ },
+ {
+ taskId: 'task-2', activityId: 'art-end', nodeName: '品牌策划主管审核',
+ assigneeUserId: 'user-2', assigneeName: '乙', assigneeDepartment: '品牌中心',
+ isBrandCenter: true, isLeadership: true, isActive: false, reviewPassed: true,
+ result: 'AGREE', createdAt: '2026-08-02T01:00:00.000Z', finishedAt: '2026-08-02T02:00:00.000Z',
+ },
+ ]
+ expect(resolveDingWorkflowDetailMilestones(DING_WORKFLOW_ALLOWED_PROCESS_CODES[0], tasks)).toEqual({
+ assignmentNodeLabel: '品牌策划主管分配任务',
+ assignmentStartedAt: '2026-08-01T01:00:00.000Z',
+ reviewNodeLabel: '品牌策划主管审核',
+ reviewFinishedAt: '2026-08-02T02:00:00.000Z',
+ })
+
+ expect(resolveDingWorkflowDetailMilestones(DING_WORKFLOW_ALLOWED_PROCESS_CODES[1], [
+ { ...tasks[0], nodeName: '内容部负责人', createdAt: '2026-08-03T01:00:00.000Z' },
+ { ...tasks[0], taskId: 'task-3', nodeName: '编导', finishedAt: '2026-08-04T02:00:00.000Z' },
+ { ...tasks[0], taskId: 'task-4', nodeName: '编导', finishedAt: '2026-08-05T02:00:00.000Z' },
+ ])).toEqual({
+ assignmentNodeLabel: '内容主管分配任务',
+ assignmentStartedAt: '2026-08-03T01:00:00.000Z',
+ reviewNodeLabel: '编导审核',
+ reviewFinishedAt: '2026-08-05T02:00:00.000Z',
+ })
+ })
+
it('matches initiators by DingTalk roster profile and formats the HR organization path', () => {
expect(resolveDingWorkflowInitiator({
displayName: '荀瑶',
diff --git a/lib/ding-workflow-sync.ts b/lib/ding-workflow-sync.ts
index d19e7751..ab397446 100644
--- a/lib/ding-workflow-sync.ts
+++ b/lib/ding-workflow-sync.ts
@@ -156,6 +156,22 @@ export type OngoingDingWorkflowActiveTask = {
finishedAt: string | null
}
+export type DingWorkflowDetailFormFields = {
+ platform: string | null
+ brand: string | null
+ category: string | null
+ spu: string | null
+ demandType: string | null
+ standardOutputDeadline: string | null
+}
+
+export type DingWorkflowDetailMilestones = {
+ assignmentNodeLabel: string
+ assignmentStartedAt: string | null
+ reviewNodeLabel: string
+ reviewFinishedAt: string | null
+}
+
type WorkflowSnapshotPayload = {
processInstanceId: string
businessId: string | null
@@ -183,6 +199,7 @@ type WorkflowSnapshotPayload = {
requesterName: string
requesterDepartment: string
projectType: string
+ formFields: DingWorkflowDetailFormFields
activeTasks: OngoingDingWorkflowActiveTask[]
}
@@ -214,6 +231,11 @@ export type OngoingDingWorkflowListItem = {
requesterDepartment: string
initiatorName: string
initiatorDepartment: string
+ formFields: DingWorkflowDetailFormFields
+ assignmentNodeLabel: string
+ assignmentStartedAt: string | null
+ reviewNodeLabel: string
+ reviewFinishedAt: string | null
activeTasks: OngoingDingWorkflowActiveTask[]
}
@@ -401,6 +423,43 @@ function firstSchemeValue(fields: SourceSchemeField[], names: string[]): string
return null
}
+function collectSchemeDisplayValues(value: unknown): string[] {
+ if (value === null || value === undefined) return []
+ if (Array.isArray(value)) return value.flatMap(collectSchemeDisplayValues)
+ if (typeof value === 'object') {
+ const record = value as Record
+ return ['name', 'label', 'value', 'text', 'title']
+ .flatMap((key) => collectSchemeDisplayValues(record[key]))
+ }
+
+ const normalized = clean(value)
+ if (!normalized) return []
+ if (normalized.startsWith('[') || normalized.startsWith('{')) {
+ try {
+ return collectSchemeDisplayValues(JSON.parse(normalized))
+ } catch {
+ // Keep non-JSON form values unchanged.
+ }
+ }
+ return [normalized]
+}
+
+export function normalizeDingWorkflowDetailValue(value: unknown): string | null {
+ const values = Array.from(new Set(collectSchemeDisplayValues(value)))
+ return values.length > 0 ? values.join(' / ') : null
+}
+
+function buildDingWorkflowDetailFormFields(fields: SourceSchemeField[]): DingWorkflowDetailFormFields {
+ return {
+ platform: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['平台'])),
+ brand: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['品牌'])),
+ category: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['类目'])),
+ spu: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['SPU', 'Spu', 'spu'])),
+ demandType: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['需求类型'])),
+ standardOutputDeadline: normalizeDingWorkflowDetailValue(firstSchemeValue(fields, ['标准出图最长时效限制'])),
+ }
+}
+
function titleOriginatorName(value: unknown): string | null {
return clean(value)?.match(/^(.+?)提交的/)?.[1]?.trim() || null
}
@@ -430,6 +489,72 @@ function normalizeWorkflowTasks(value: unknown): OngoingDingWorkflowActiveTask[]
})
}
+function normalizeDetailFormFields(value: unknown): DingWorkflowDetailFormFields {
+ const record = value && typeof value === 'object' && !Array.isArray(value)
+ ? value as Record
+ : {}
+ return {
+ platform: normalizeDingWorkflowDetailValue(record.platform),
+ brand: normalizeDingWorkflowDetailValue(record.brand),
+ category: normalizeDingWorkflowDetailValue(record.category),
+ spu: normalizeDingWorkflowDetailValue(record.spu),
+ demandType: normalizeDingWorkflowDetailValue(record.demandType),
+ standardOutputDeadline: normalizeDingWorkflowDetailValue(record.standardOutputDeadline),
+ }
+}
+
+const DETAIL_MILESTONE_NODES: Readonly> = {
+ [DING_WORKFLOW_ALLOWED_PROCESS_CODES[0]]: {
+ assignmentNodeLabel: '品牌策划主管分配任务',
+ assignmentNodeNames: ['品牌策划主管分配任务'],
+ reviewNodeLabel: '品牌策划主管审核',
+ reviewNodeNames: ['品牌策划主管审核'],
+ },
+ [DING_WORKFLOW_ALLOWED_PROCESS_CODES[1]]: {
+ assignmentNodeLabel: '内容主管分配任务',
+ assignmentNodeNames: ['内容主管分配任务', '内容部负责人'],
+ reviewNodeLabel: '编导审核',
+ reviewNodeNames: ['编导审核', '编导'],
+ },
+}
+
+function compareTaskTimestamps(valueA: string | null, valueB: string | null) {
+ return String(valueA || '').localeCompare(String(valueB || ''))
+}
+
+export function resolveDingWorkflowDetailMilestones(
+ processCodeValue: unknown,
+ tasks: OngoingDingWorkflowActiveTask[],
+): DingWorkflowDetailMilestones {
+ const processCode = normalizeDingWorkflowProcessCode(processCodeValue) || ''
+ const config = DETAIL_MILESTONE_NODES[processCode] || {
+ assignmentNodeLabel: '分配任务',
+ assignmentNodeNames: ['分配任务'],
+ reviewNodeLabel: '审核',
+ reviewNodeNames: ['审核'],
+ }
+ const assignmentStartedAt = tasks
+ .filter((task) => config.assignmentNodeNames.includes(task.nodeName) && task.createdAt)
+ .map((task) => task.createdAt)
+ .sort(compareTaskTimestamps)[0] || null
+ const reviewFinishedAt = tasks
+ .filter((task) => config.reviewNodeNames.includes(task.nodeName) && task.finishedAt)
+ .map((task) => task.finishedAt)
+ .sort(compareTaskTimestamps)
+ .at(-1) || null
+ return {
+ assignmentNodeLabel: config.assignmentNodeLabel,
+ assignmentStartedAt,
+ reviewNodeLabel: config.reviewNodeLabel,
+ reviewFinishedAt,
+ }
+}
+
function nonNegativeInteger(value: unknown): number {
const number = Number(value)
return Number.isFinite(number) && number > 0 ? Math.floor(number) : 0
@@ -823,7 +948,10 @@ async function fetchWorkflowAggregates(pool: ConnectionPool, processInstanceIds:
INNER JOIN workflow_ids ids
ON ids.processInstanceId = CONVERT(nvarchar(255), scheme.processInstanceId)
WHERE
- LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(2000), scheme.name), ''))) IN ('品牌', '需求类型', '需求部门', '需求人', '任务类型')
+ LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(2000), scheme.name), ''))) IN (
+ '平台', '品牌', '类目', 'SPU', 'Spu', 'spu', '需求类型', '标准出图最长时效限制',
+ '需求部门', '需求人', '任务类型'
+ )
OR CONVERT(nvarchar(500), scheme.componentType) IN ('InnerContactField', 'TableField');
`)
@@ -1036,6 +1164,7 @@ function buildSnapshotPayload(
requesterName,
requesterDepartment,
projectType: getDingWorkflowProjectType(processCode),
+ formFields: buildDingWorkflowDetailFormFields(schemeFields),
activeTasks: workflowTasks,
}]
})
@@ -1051,7 +1180,7 @@ async function upsertSnapshotBatch(rows: WorkflowSnapshotPayload[], syncedAt: Da
"source_created_at_raw", "source_updated_at_raw", "source_finished_at_raw",
"is_ongoing", "scheme_field_count", "task_count", "active_task_count",
"latest_task_status", "latest_task_at_raw", "brand", "demand_type", "requester_name",
- "requester_department", "project_type", "active_tasks", "synced_at", "updated_at"
+ "requester_department", "project_type", "form_fields", "active_tasks", "synced_at", "updated_at"
)
SELECT
incoming."processInstanceId", incoming."businessId", incoming."title", incoming."result",
@@ -1060,7 +1189,7 @@ async function upsertSnapshotBatch(rows: WorkflowSnapshotPayload[], syncedAt: Da
incoming."sourceCreatedAtRaw", incoming."sourceUpdatedAtRaw", incoming."sourceFinishedAtRaw",
incoming."isOngoing", incoming."schemeFieldCount", incoming."taskCount", incoming."activeTaskCount",
incoming."latestTaskStatus", incoming."latestTaskAtRaw", incoming."brand", incoming."demandType", incoming."requesterName",
- incoming."requesterDepartment", incoming."projectType", incoming."activeTasks", $2::timestamp, $2::timestamp
+ incoming."requesterDepartment", incoming."projectType", incoming."formFields", incoming."activeTasks", $2::timestamp, $2::timestamp
FROM jsonb_to_recordset($1::jsonb) AS incoming(
"processInstanceId" text, "businessId" text, "title" text, "result" text,
"originatorUserId" text, "originatorDeptId" text, "originatorDeptName" text,
@@ -1068,7 +1197,7 @@ async function upsertSnapshotBatch(rows: WorkflowSnapshotPayload[], syncedAt: Da
"sourceCreatedAtRaw" text, "sourceUpdatedAtRaw" text, "sourceFinishedAtRaw" text,
"isOngoing" boolean, "schemeFieldCount" integer, "taskCount" integer, "activeTaskCount" integer,
"latestTaskStatus" text, "latestTaskAtRaw" text, "brand" text, "demandType" text, "requesterName" text,
- "requesterDepartment" text, "projectType" text, "activeTasks" jsonb
+ "requesterDepartment" text, "projectType" text, "formFields" jsonb, "activeTasks" jsonb
)
ON CONFLICT ("process_instance_id") DO UPDATE SET
"business_id" = EXCLUDED."business_id",
@@ -1096,6 +1225,7 @@ async function upsertSnapshotBatch(rows: WorkflowSnapshotPayload[], syncedAt: Da
"requester_name" = EXCLUDED."requester_name",
"requester_department" = EXCLUDED."requester_department",
"project_type" = EXCLUDED."project_type",
+ "form_fields" = EXCLUDED."form_fields",
"active_tasks" = EXCLUDED."active_tasks",
"synced_at" = EXCLUDED."synced_at",
"updated_at" = EXCLUDED."updated_at"
@@ -1265,6 +1395,7 @@ const ONGOING_WORKFLOW_SELECT = {
brand: true,
requesterName: true,
requesterDepartment: true,
+ formFields: true,
activeTasks: true,
originatorUserId: true,
originatorDeptName: true,
@@ -1342,6 +1473,7 @@ function mapSnapshotListItem(row: {
brand: string | null
requesterName: string | null
requesterDepartment: string | null
+ formFields: unknown
activeTasks: unknown
originatorUserId: string | null
originatorDeptName: string | null
@@ -1357,6 +1489,8 @@ function mapSnapshotListItem(row: {
name: row.requesterName,
department: row.originatorDeptName || row.requesterDepartment,
})
+ const tasks = normalizeWorkflowTasks(row.activeTasks)
+ const milestones = resolveDingWorkflowDetailMilestones(processCode, tasks)
return {
id: row.processInstanceId,
businessId: row.businessId,
@@ -1371,7 +1505,9 @@ function mapSnapshotListItem(row: {
|| '未记录部门',
initiatorName: initiator.name,
initiatorDepartment: initiator.department,
- activeTasks: normalizeWorkflowTasks(row.activeTasks).filter((task) => task.isActive),
+ formFields: normalizeDetailFormFields(row.formFields),
+ ...milestones,
+ activeTasks: tasks.filter((task) => task.isActive),
originatorUserId: row.originatorUserId,
originatorDeptName: row.originatorDeptName,
sourceCreatedAt: sourceWorkflowTimestampToIso(row.sourceCreatedAtRaw),
diff --git a/prisma/migrations/20260827_add_ding_workflow_detail_fields/migration.sql b/prisma/migrations/20260827_add_ding_workflow_detail_fields/migration.sql
new file mode 100644
index 00000000..67c4a955
--- /dev/null
+++ b/prisma/migrations/20260827_add_ding_workflow_detail_fields/migration.sql
@@ -0,0 +1,9 @@
+ALTER TABLE "ding_workflow_snapshots"
+ ADD COLUMN "form_fields" JSONB;
+
+-- 新字段需要对 2026-04-01 之后的两类流程重新建立一次完整快照。
+-- 下一次小时同步会在完成全量对齐后重新写入三表复合游标。
+UPDATE "ding_workflow_sync_states"
+SET "source_cursor_raw" = NULL,
+ "updated_at" = CURRENT_TIMESTAMP
+WHERE "id" = 'ding-workflow-hourly';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 93787467..e255cce6 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1310,6 +1310,7 @@ model DingWorkflowSnapshot {
requesterName String? @map("requester_name")
requesterDepartment String? @map("requester_department")
projectType String? @map("project_type")
+ formFields Json? @map("form_fields")
activeTasks Json? @map("active_tasks")
syncedAt DateTime @map("synced_at")
createdAt DateTime @default(now()) @map("created_at")