From f52d3b910556fcadf0ae262bafa251756e06488c Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期日, 30 九月 2018 11:41:48 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 7f53011..4c076cd 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3483,7 +3483,7 @@
//鐢垫睜閰嶇粍绠＄悊(閲嶈)
public List serchMakeGroup(Object obj){
BattInf binf=(BattInf) obj;
- String sql="SELECT distinct BattGroupId,stationid,stationname1,stationname2,stationname,stationname3,BattProducer,MonVolStd,MonCapStd,monCount from db_battinf.tb_battinf where stationname2 like ? ";
+ String sql="SELECT distinct BattGroupId,battgroupname,stationid,stationname1,stationname2,stationname,stationname3,BattProducer,MonVolStd,MonCapStd,monCount from db_battinf.tb_battinf where stationname2 like ? ";
//閫変腑鍝佺墝涓�鑷�
String producerSqlT=" order by BattProducer,MonCapStd,MonVolStd ";//涓�鑷�
String producerSqlF=" order by MonCapStd,MonVolStd ";//涓嶄竴鑷�
@@ -3500,6 +3500,7 @@
while(rs.next()){
BattInf binf=new BattInf();
binf.setBattGroupId(rs.getInt("battGroupId"));
+ binf.setBattGroupName(rs.getString("battGroupName"));
binf.setStationId(rs.getString("stationId"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
--
Gitblit v1.9.1