@chenchaolong/plugin-trade-compliance-workbench 1.0.102 → 1.0.104

package/dist/lib/workbench.service.js

@@ -1121,7 +1121,6 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 return current;
             }
             const counts = await this.catalogBatchCounts(manager, scope, current);
-            const outcome = catalogTerminalOutcome(counts);
             current.progress.successCount = counts.successCount;
             current.progress.duplicateCount = counts.duplicateCount;
             current.progress.invalidCount = counts.invalidCount;
@@ -1135,9 +1134,21 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 current.completedAt = null;
                 return repo.save(current);
             }
-            current.progress.outcome = outcome.outcome;
-            if (outcome.status === 'FAILED') {
-                await this.applyImportTaskFailure(manager, scope, current, 'FAILED', outcome.errorCode, outcome.errorMessage);
+            if (counts.successCount > 0 && current.progress.reviewPendingCount > 0) {
+                await this.closeUnresolvedCatalogReviews(manager, scope, current);
+                const settledCounts = await this.catalogBatchCounts(manager, scope, current);
+                current.progress.successCount = settledCounts.successCount;
+                current.progress.duplicateCount = settledCounts.duplicateCount;
+                current.progress.invalidCount = settledCounts.invalidCount;
+                current.progress.skippedCount = settledCounts.skippedCount;
+            }
+            const terminalCounts = counts.successCount > 0 && current.progress.reviewPendingCount === 0
+                ? await this.catalogBatchCounts(manager, scope, current)
+                : counts;
+            const terminalOutcome = catalogTerminalOutcome(terminalCounts);
+            current.progress.outcome = terminalOutcome.outcome;
+            if (terminalOutcome.status === 'FAILED') {
+                await this.applyImportTaskFailure(manager, scope, current, 'FAILED', terminalOutcome.errorCode, terminalOutcome.errorMessage);
             }
             else {
                 await this.publishCatalogDraft(manager, scope, current);
@@ -1541,6 +1552,10 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             await this.reconcileCatalogReviewPendingCount(reviewRepo, scope, task);
             task.progress.progressVersion += 1;
             task.progress.lastProgressAt = new Date().toISOString();
+            const currentCounts = await this.catalogBatchCounts(manager, scope, task);
+            if (currentCounts.successCount > 0 && task.progress.reviewPendingCount > 0) {
+                await this.closeUnresolvedCatalogReviews(manager, scope, task);
+            }
             if (task.progress.reviewPendingCount === 0) {
                 const counts = await this.catalogBatchCounts(manager, scope, task);
                 const outcome = catalogTerminalOutcome(counts);
@@ -1586,6 +1601,36 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             task.progress.reviewPendingCount = pendingCount;
         return pendingCount;
     }
+    async closeUnresolvedCatalogReviews(manager, scope, task) {
+        const reviewRepo = manager.getRepository(CatalogReviewBlock);
+        const blocks = await reviewRepo.find({ where: {
+                ...activeScope(scope), importTaskId: task.id, status: In(['PENDING', 'LEASED'])
+            }, order: { ordinal: 'ASC' } });
+        if (blocks.length === 0) {
+            await this.reconcileCatalogReviewPendingCount(reviewRepo, scope, task);
+            return;
+        }
+        const batch = await this.appendUnresolvedCatalogReviewIssues(manager, scope, task, blocks);
+        const now = new Date();
+        for (const block of blocks) {
+            block.status = 'REJECTED';
+            block.leaseToken = null;
+            block.leaseExpiresAt = null;
+            block.resolvedAt = now;
+            block.resolutionFingerprint = null;
+            await reviewRepo.save(block);
+        }
+        if (task.progress) {
+            task.progress.reviewRejectedCount += blocks.length;
+            task.progress.reviewPendingCount = 0;
+            if (batch) {
+                task.progress.successCount = batch.successCount;
+                task.progress.duplicateCount = batch.duplicateCount;
+                task.progress.invalidCount = batch.invalidCount;
+                task.progress.skippedCount = batch.skippedCount;
+            }
+        }
+    }
     async setImportObserverConversation(scope, taskId, conversationId) {
         const normalizedConversationId = requiredId(conversationId, '观察会话标识');
         return this.dataSource.transaction(async (manager) => {
@@ -1701,6 +1746,42 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         }
         return batchRepo.save(batch);
     }
+    async appendUnresolvedCatalogReviewIssues(manager, scope, task, blocks) {
+        if (blocks.length === 0 || !task.resultEntityId)
+            return null;
+        const controlled = task.documentType === 'CONTROLLED_CATALOG';
+        const batchRepo = controlled
+            ? manager.getRepository(ControlledCatalogBatch)
+            : manager.getRepository(SanctionCatalogBatch);
+        const issueRepo = controlled
+            ? manager.getRepository(ControlledCatalogImportIssue)
+            : manager.getRepository(SanctionCatalogImportIssue);
+        const batch = await required(batchRepo.findOne({ where: {
+                ...activeScope(scope), id: task.resultEntityId
+            } }), controlled ? '管控目录批次不存在' : '制裁目录批次不存在');
+        for (const block of blocks) {
+            const parsedPayload = {
+                reviewBlockId: block.id,
+                reviewDecision: 'UNRESOLVED_AUTO_SKIP',
+                payload: block.payload,
+                reasons: block.reasons
+            };
+            const existing = await issueRepo.findOne({ where: {
+                    ...activeScope(scope), batchId: batch.id, issueType: 'INVALID', parsedPayload
+                } });
+            if (existing)
+                continue;
+            batch.totalCount += 1;
+            batch.invalidCount += 1;
+            batch.skippedCount += 1;
+            await issueRepo.save(issueRepo.create({
+                ...createdScope(scope), batchId: batch.id, issueType: 'INVALID', sourceSequence: batch.totalCount,
+                sourceLocation: block.sourceLocation, sourceContent: block.sourceContent,
+                parsedPayload, message: '复核未完成，来源行已跳过'
+            }));
+        }
+        return batchRepo.save(batch);
+    }
     async appendStalledCatalogReviewIssues(manager, scope, task, batch, blocks) {
         const issueRepo = (task.documentType === 'CONTROLLED_CATALOG'
             ? manager.getRepository(ControlledCatalogImportIssue)