xiongyuxing/gongxue-base
1
0
Fork 0
forked from wangziqi/gongxue-base
Code Pull Requests Activity

feat: resolve public bank conflicts

Browse Source
This commit is contained in:
Codex
2026-06-29 13:50:41 +08:00
parent 93ec1a07d2
commit 7fc92986a5
13 changed files with 547 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/taro/src/services/tenantAdmin.ts
View File

@@ -85,6 +85,26 @@ export interface PublicQuestionBankItem {
adoption?: Record<string, unknown> | null;
}
export interface PublicQuestionBankConflictItem {
sourceQuestionId?: string;
targetQuestionId?: string | null;
action?: string;
sourceHash?: string;
previousSourceHash?: string | null;
targetHash?: string | null;
}
export interface PublicQuestionBankConflictsResult {
adoptionId?: string;
syncStatus?: string;
status?: string;
lastSyncedAt?: string | null;
updatedAt?: string;
conflictCount?: number;
counts?: Record<string, unknown>;
conflicts?: PublicQuestionBankConflictItem[];
}
export interface ImportIssueItem {
id: string;
rowNo?: number | null;
@@ -250,11 +270,18 @@ export async function syncPublicQuestionBank(input: { adoptionId: string; copyLi
}
export async function loadPublicQuestionBankConflicts(adoptionId: string) {
return apiRequest<{ item?: Record<string, unknown> }>('/api/tenant-content/public-question-banks/conflicts', {
return apiRequest<{ item?: PublicQuestionBankConflictsResult }>('/api/tenant-content/public-question-banks/conflicts', {
query: { adoptionId },
});
}
export async function resolvePublicQuestionBankConflict(input: { adoptionId: string; sourceQuestionId: string; resolution: 'accept_platform' | 'keep_local' }) {
return apiRequest<{ item?: Record<string, unknown> }>('/api/tenant-content/public-question-banks/conflicts/resolve', {
method: 'POST',
body: input,
});
}
export async function runImportPostCheck(jobId: string) {
return apiRequest<{ item?: Record<string, unknown> }>('/api/tenant-content/imports/post-check', {
method: 'POST',