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/devicealarm.ts | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/modules/push/controller/admin/devicealarm.ts b/src/modules/push/controller/admin/devicealarm.ts
index 27a6d0f..80758fd 100644
--- a/src/modules/push/controller/admin/devicealarm.ts
+++ b/src/modules/push/controller/admin/devicealarm.ts
@@ -33,12 +33,19 @@
],
fieldEq: [
{ column: 'a.devSerial', requestParam: 'devSerial' },
- { column: 'a.alarmType', requestParam: 'alarmType' },
- { column: 'c.name', requestParam: 'departmentName' }
+ { column: 'a.alarmType', requestParam: 'alarmType' }
],
fieldLike: [
{ column: 'c.name', requestParam: 'departmentName' }
- ]
+ ],
+ where: async ctx => {
+ const { startTime, endTime } = ctx.request.body;
+ const conditions: any[][] = [];
+ if (startTime && endTime) {
+ conditions.push(['a.alarmTime BETWEEN :startTime AND :endTime', { startTime, endTime }]);
+ }
+ return conditions;
+ }
}
})
export class AdminPushDevicealarmController extends BaseController {}
\ No newline at end of file
--
Gitblit v1.9.1