From db53916414e35580e8f39bc8f7dd1897f8200eda Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 10:00:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 8b9a67b..657a51f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1133,7 +1133,7 @@
});
return list;
}
-
+ //瀹炴椂鍘嗗彶鏈哄巻鍗�
public List serchByBattgroupId(Object obj){
BattInf binf=(BattInf)obj;
String sql="select * from db_battinf.tb_battinf where battgroupid=?";
@@ -1234,7 +1234,7 @@
batt.setSignalId(rs.getString("SignalId"));
batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));
-
+ batt.setInstall_user(rs.getString("install_user"));
batt.setSignalName(rs.getString("SignalName"));
int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//鍓╀綑淇濅慨澶╂暟
batt.setBattGuarantDayCount(BattGuarantDayCount);
--
Gitblit v1.9.1