From 1e230c759b103fe6c8768d91aa566408293b93c6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 14:46:59 +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 |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 6c4d8ba..0a235cd 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1465,7 +1465,7 @@
 				Connection conn=DBUtil.getConn();
 				String numberSql=" SELECT FOUND_ROWS() number";
 				String sql="";
-				String baseSql="select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName,stationip,BattGroupName,BattGroupName1,battgroupnum,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate "
+				String baseSql="select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName2,StationName5,StationName,stationip,BattGroupName,BattGroupName1,battgroupnum,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate "
 						+ " from db_battinf.tb_battinf  "
 						+ " where ";
 				//閫夊彇钃勭數姹犵粍鏉′欢
@@ -1483,14 +1483,14 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-				" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? )";
+				" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? )";
 				baseSql+=userSql;
 				String endSql=" order by StationName1 asc,db_battinf.tb_battinf.BattgroupId asc ";
 				sql=baseSql+endSql;
 				String limitSql=" limit ?,? ";
 				sql+=limitSql;
 				//System.out.println(sql);
-				List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
+				List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
 						new CallBack() {
 							public List getResults(ResultSet rs) {
 								List list=new ArrayList();
@@ -1501,6 +1501,8 @@
 										binf.setStationId(rs.getString("stationId"));
 										binf.setStationName(rs.getString("stationName"));
 										binf.setStationName1(rs.getString("stationName1"));
+										binf.setStationName2(rs.getString("stationName2"));
+										binf.setStationName5(rs.getString("stationName5"));
 										binf.setStationIp(rs.getString("stationIp"));
 										binf.setBattGroupName(rs.getString("battGroupName"));
 										binf.setBattGroupName1(rs.getString("battGroupName1"));
@@ -1666,7 +1668,7 @@
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
 		String sql="";
-		String baseSql=" select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
+		String baseSql=" select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName2,StationName5,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
 			       " from  db_battinf.tb_battinf " +
 			       " where  ";
 		//閫夊彇钃勭數姹犵粍鏉′欢
@@ -1684,7 +1686,7 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-		        " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
+		        " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?) ";
 		baseSql+=userSql;
 		//鎺掑簭
 		String endSql=" order by db_battinf.tb_battinf.battgroupid asc ";
@@ -1694,7 +1696,7 @@
 		sql=baseSql+endSql+limitSql;
 		//System.out.println(sql);
         List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{
-			binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
+			binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",  
 			(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -1706,6 +1708,8 @@
 						binf.setBattGroupId(rs.getInt("battGroupId"));
 						binf.setStationId(rs.getString("stationId"));
 						binf.setStationName1(rs.getString("stationName1"));
+						binf.setStationName2(rs.getString("stationName2"));
+						binf.setStationName5(rs.getString("stationName5"));
 						binf.setStationName(rs.getString("stationName"));
 						binf.setStationIp(rs.getString("stationIp"));
 						binf.setBattGroupName(rs.getString("battGroupName"));
@@ -1885,7 +1889,7 @@
 			Page page =bmd.getPage();
 			Batttestdata_inf tinf=bmd.getTdata();
 			String sql="";
-			String baseSql=" select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
+			String baseSql=" select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName2,StationName5,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
 				       " ,db_batt_testdata.tb_batttestdata_inf.test_record_count,test_starttime " +
 				       "from  db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf " +
 				       " where db_battinf.tb_battinf.battgroupid=db_batt_testdata.tb_batttestdata_inf.battgroupid " +
@@ -1905,7 +1909,7 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-			    " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
+			    " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?)";
 			baseSql+=userSql;
 			//鍏呯數鏀剧數閫夋嫨
 			String test_typeA="";//鍏ㄩ儴
@@ -1941,7 +1945,7 @@
 			//System.out.println(sql);
 	     	List<BattInf> list=DAOHelper.executeQuery(sql,DBUtil.getConn(), new Object[]{
 				tinf.getRecord_time(),tinf.getRecord_time1()
-				,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%"
+				,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
 				}, new CallBack() {
 				
 				public List getResults(ResultSet rs) {
@@ -1952,6 +1956,8 @@
 							BattInf binf=new BattInf();
 							binf.setBattGroupId(rs.getInt("battGroupId"));
 							binf.setStationName1(rs.getString("stationName1"));
+							binf.setStationName2(rs.getString("stationName2"));
+							binf.setStationName2(rs.getString("stationName5"));
 							binf.setStationName(rs.getString("stationName"));
 							binf.setStationIp(rs.getString("stationIp"));
 							binf.setBattGroupName(rs.getString("battGroupName"));

--
Gitblit v1.9.1