From 98ce961272c596468a4cb4b2498a3c70048e4aed Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期四, 24 九月 2026 15:57:31 +0800
Subject: [PATCH] bug修复
---
src/modules/push/controller/admin/weight.ts | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/modules/push/controller/admin/weight.ts b/src/modules/push/controller/admin/weight.ts
index e617517..3fca2e5 100644
--- a/src/modules/push/controller/admin/weight.ts
+++ b/src/modules/push/controller/admin/weight.ts
@@ -1,6 +1,7 @@
import { CoolController, BaseController } from '@cool-midway/core';
import { PushWeightEntity } from '../../entity/weight';
import { PushWeightService } from '../../service/weight';
+import { BasicdataWastetypeEntity } from '../../../basicdata/entity/wastetype';
/**
* 鍘熷绉伴噸鏁版嵁绠＄悊
@@ -10,8 +11,16 @@
entity: PushWeightEntity,
service: PushWeightService,
pageQueryOp: {
- select: ['a.*'],
+ select: ['a.*', 'b.name AS garbageName'],
fieldEq: ['a.deviceNo', 'a.garbageType'],
+ join: [
+ {
+ entity: BasicdataWastetypeEntity,
+ alias: 'b',
+ condition: 'a.garbageType = b.code',
+ type: 'leftJoin',
+ },
+ ],
where: async ctx => {
const { startTime, endTime } = ctx.request.body;
const conditions = [];
--
Gitblit v1.9.1