From c58e6ab34ae1cfbc8f805ec667af94bc686e5f35 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 14 十二月 2023 09:28:22 +0800
Subject: [PATCH] 历史加属性
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index c3c189f..10d88f9 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -171,7 +171,7 @@
//鏌ヨbreak鍘嗗彶鍛婅鏁伴噺
public List getListBreakAlm(BreakAlarmDto alm){
- String sql="select breakAlarm.* from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
+ String sql="select breakAlarm.*,breaker_type,breaker_name,breaker_addr from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
+" where breakAlarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
" and tb_ckpowerdev_break_alarm_config.break_id=tb_breaker_inf.breaker_id ";
if(alm.getAlmStarttime()!=null){
@@ -206,6 +206,9 @@
ph.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
ph.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time"));
ph.setAlmClearedType(rs.getInt("alm_cleared_type"));
+ ph.setBreakerType(rs.getString("breaker_type"));
+ ph.setBreakerName(rs.getString("breaker_name"));
+ ph.setBreakerAddr(rs.getString("breaker_addr"));
list.add(ph);
}
return list;
--
Gitblit v1.9.1