From dc77841fcc93a5078469bf8dd5d6824d1c63f073 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期日, 20 九月 2026 15:30:03 +0800
Subject: [PATCH] 修复每日称重汇总任务

---
 src/modules/report/service/taskservicesite.ts |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/report/service/taskservicesite.ts b/src/modules/report/service/taskservicesite.ts
index 60582fb..d457fd6 100644
--- a/src/modules/report/service/taskservicesite.ts
+++ b/src/modules/report/service/taskservicesite.ts
@@ -58,8 +58,8 @@
         // 鏄犲皠琛細灏嗘槑缁嗛噷鐨� garbageType 鏄犲皠鍒颁綘 Entity 閲岀殑瀛楁鍚庣紑
         const typeKeyMap: Record<string, string> = {
             'SW60': 'Sw60', 'SW61': 'Sw61', 'SW62': 'Sw62', 'SW63': 'Sw63', 'SW64': 'Sw64',
-            '900-001-S62': 'Sw62001', '900-002-S62': 'Sw62002', '900-003-S62': 'Sw62003',
-            '900-004-S62': 'Sw62004', '900-005-S62': 'Sw62005', '900-006-S62': 'Sw62006', '900-007-S62': 'Sw62007'
+            'Sw62001': 'Sw62001', 'Sw62002': 'Sw62002', 'Sw62003': 'Sw62003',
+            'Sw62004': 'Sw62004', 'Sw62005': 'Sw62005', 'Sw62006': 'Sw62006', 'Sw62007': 'Sw62007'
         };
 
 
@@ -142,12 +142,14 @@
             for (let i = 0; i < finalRecords.length; i += chunkSize) {
                 const chunk = finalRecords.slice(i, i + chunkSize);
 
-                await this.reportDailysiteEntity.createQueryBuilder()
+                const result = await this.reportDailysiteEntity.createQueryBuilder()
                     .insert()
                     .values(chunk)
-                    // 馃挕 鏄惧紡澹版槑锛氬綋 ['date', 'siteId'] 鍙戠敓鍐茬獊鏃讹紝寮鸿鎶� allUpdateFields 閲岀殑瀛楁鍏ㄩ儴鏇存柊涓�閬�
                     .orUpdate(allUpdateFields, ['date', 'siteId'])
+                    .updateEntity(false)        // 鈫� 鍔犺繖涓�琛岋紝璺宠繃 ReturningResultsEntityUpdator
                     .execute();
+
+                console.log(`[SITE-UPSERT-OK] date=${targetDate} chunk=${chunk} raw=${JSON.stringify(result?.raw)}`);
             }
         }
 

--
Gitblit v1.9.1