From 50114c2feb0ae955bfaf1da8ce7be62344ebc110 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期三, 21 十一月 2018 12:35:22 +0800
Subject: [PATCH] 停电掉站饼状图修改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..f11a5a4 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1080,7 +1080,7 @@
" left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? " +
+ " where db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.Station_install=1 " +
" limit 1";
List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
@@ -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