From 30fb13e332c67f3088c0bfd5a42f64453939cdab Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 27 十二月 2019 16:34:59 +0800
Subject: [PATCH] 修改
---
Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java b/Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java
index 6c79029..dba75c1 100644
--- a/Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -84,7 +84,7 @@
public List serchByCondition(Object obj) {
BattInf binf=(BattInf) obj;
String sql="select distinct db_battinf.tb_battinf.BattGroupId,db_battinf.tb_battinf.BattGroupName "
- + ",db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.batt_state "
+ + ",db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.batt_state,db_ram_db.tb_batt_rtstate.rec_datetime "
//+ ",(case when db_alarm.tb_battalarm_data.alm_signal_id is null then 0 ELSE db_alarm.tb_battalarm_data.alm_signal_id end) AS alm_signal_id "
+ " FROM db_battinf.tb_battinf "
+ " LEFT OUTER JOIN db_ram_db.tb_batt_rtstate on db_battinf.tb_battinf.BattGroupId=db_ram_db.tb_batt_rtstate.BattGroupId "
@@ -105,6 +105,7 @@
binf.setMonVolLowToAvg(rs.getFloat("group_vol"));
binf.setLoad_curr(rs.getFloat("group_curr"));
binf.setNum(rs.getInt("batt_state"));
+ binf.setBattInUseDate(rs.getTimestamp("rec_datetime"));
//binf.setMonNum(rs.getInt("alm_signal_id"));
//binf.setSignalName(AlarmDaoFactory.getAlarmName(rs.getInt("alm_signal_id")));
list.add(binf);
--
Gitblit v1.9.1