From 22c5f37a587bfb3363534fed05647faf5f93c8fe Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期六, 26 九月 2026 11:42:42 +0800
Subject: [PATCH] 修改首页显示和统计任务
---
src/modules/report/service/screen.ts | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/modules/report/service/screen.ts b/src/modules/report/service/screen.ts
index c3ba06b..3f1ab70 100644
--- a/src/modules/report/service/screen.ts
+++ b/src/modules/report/service/screen.ts
@@ -371,17 +371,19 @@
return (await qb.getRawOne()) || {};
}
+ /** 鍚嶇О鍙栧叏閮ㄧ绫伙紱codes 浠嶅彧鍚惎鐢ㄩ」锛屼緵 KPI/瓒嬪娍娌跨敤鍘熷彛寰勩�傚垎绫诲浘涓嶅啀鐢� codes 杩囨护銆� */
private async enabledWaste() {
const list = await this.wasteTypeRepo.find({
- where: { status: 1 },
- select: ['code', 'name'],
+ select: ['code', 'name', 'status'],
});
const names = new Map<string, string>();
const codes = new Set<string>();
list.forEach(e => {
const code = String(e.code).toUpperCase();
- codes.add(code);
names.set(code, e.name);
+ if (Number(e.status) === 1) {
+ codes.add(code);
+ }
});
return { names, codes };
}
@@ -412,6 +414,7 @@
return cols.map(col => `IFNULL(a.${col},0)`).join(' + ');
}
+ /** 棣栭〉鍒嗙被鍏ㄩ噺杩斿洖锛屼笉鎸夌绫诲惎鐢ㄧ姸鎬佽鍓紱0 鍊肩敱鍓嶇鍥捐〃闅愯棌銆� */
private buildWasteMix(row: any, waste: { names: Map<string, string>; codes: Set<string> }) {
const items = [
{ code: 'SW62', key: 'Sw62' },
@@ -419,7 +422,7 @@
{ code: 'SW63', key: 'Sw63' },
{ code: 'SW61', key: 'Sw61' },
{ code: 'SW60', key: 'Sw60' },
- ].filter(e => waste.codes.has(e.code));
+ ];
return items.map(e => ({
name: waste.names.get(e.code) || this.defaultWasteName(e.code),
code: e.code,
@@ -442,11 +445,11 @@
);
}
+ /** 鍙洖鏀� 7 瀛愮被鍏ㄩ噺杩斿洖锛涚⒊鍊间繚鐣欑鍙凤紙鍑忔帓鍙负璐燂級锛屽浘琛ㄤ晶鍙栫粷瀵瑰�煎睍绀恒�� */
private buildRecycleItems(row: any, waste: { names: Map<string, string>; codes: Set<string> }) {
const fallback = ['搴熺焊', '濉戞枡', '閲戝睘', '缁囩墿', '鐜荤拑', '鐢靛瓙浜у搧', '鍏朵粬鍙洖鏀�'];
return ['001', '002', '003', '004', '005', '006', '007']
.map((idx, i) => ({ idx, i, code: `SW62${idx}` }))
- .filter(e => waste.codes.has(e.code))
.map(e => ({
name: waste.names.get(e.code) || fallback[e.i],
code: e.code,
--
Gitblit v1.9.1