~whychwj/haha.git

			@@ -519,13 +519,13 @@
			Connection conn=DBUtil.getConn();
			String numberSql=" SELECT FOUND_ROWS() number";
			String baseSql="";
			String baseTestSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_batttestdata_inf.BattgroupId),StationId,StationName,BattGroupName,moncapstd,monvolstd" +
			String baseTestSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_batttestdata_inf.BattgroupId),StationId,StationName,StationName1,StationName2,StationName5,BattGroupName,moncapstd,monvolstd" +
			",db_batt_testdata.tb_batttestdata_inf.num,db_batt_testdata.tb_batttestdata_inf.test_starttime,db_batt_testdata.tb_batttestdata_inf.test_record_count,db_batt_testdata.tb_batttestdata_inf.test_type,db_batt_testdata.tb_batttestdata_inf.test_starttype,db_batt_testdata.tb_batttestdata_inf.test_curr,db_batt_testdata.tb_batttestdata_inf.test_cap,db_batt_testdata.tb_batttestdata_inf.max_monvol,db_batt_testdata.tb_batttestdata_inf.min_monvol,db_batt_testdata.tb_batttestdata_inf.min_monnum" +
			",db_batt_testdata.tb_batttestdata_inf.data_new " +
			"from db_batt_testdata.tb_batttestdata_inf " +
			"left outer join db_battinf.tb_battinf on db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId "+
			"where db_batt_testdata.tb_batttestdata_inf.data_available=1 " ;
			String baseResSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_battresdata_inf.BattgroupId),StationId,StationName,BattGroupName,moncapstd,monvolstd" +
			String baseResSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_battresdata_inf.BattgroupId),StationId,StationName,StationName1,StationName2,StationName5,BattGroupName,moncapstd,monvolstd" +
			",db_batt_testdata.tb_battresdata_inf.num,db_batt_testdata.tb_battresdata_inf.test_starttime,db_batt_testdata.tb_battresdata_inf.test_record_count,db_batt_testdata.tb_battresdata_inf.test_type,db_batt_testdata.tb_battresdata_inf.Test_devtype,db_batt_testdata.tb_battresdata_inf.test_curr,db_batt_testdata.tb_battresdata_inf.data_new " +
			"from db_batt_testdata.tb_battresdata_inf " +
			"left outer join db_battinf.tb_battinf on db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_battresdata_inf.BattGroupId " +
			@@ -566,14 +566,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.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?)";
			String userT=" and db_batt_testdata.tb_batttestdata_inf.BattgroupId in(select distinct db_battinf.tb_battinf.battgroupid " +
			" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
			" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
			" 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.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?)";
			if(tdata.getTest_type()==5000){
			baseSql+=userR;
			}else{
			@@ -613,7 +613,7 @@
			new Object[] {
			tdata.getTest_type(),tdata.getRecord_time(),tdata.getRecord_time1(),
			binf.getBattGroupId(),
			uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",
			uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",
			(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()

			},
			@@ -628,6 +628,9 @@
			binf.setBattGroupId(rs.getInt("battGroupId"));
			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.setBattGroupName(rs.getString("battGroupName"));
			binf.setMonCapStd(rs.getFloat("monCapStd"));
			binf.setMonVolStd(rs.getFloat("monVolStd"));
			@@ -660,7 +663,7 @@
			new Object[] {
			tdata.getTest_type(),tdata.getRecord_time(),tdata.getRecord_time1(),
			binf.getBattGroupId(),
			uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",
			uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",
			(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()
			},
			new CallBack() {
			@@ -674,6 +677,9 @@
			binf.setBattGroupId(rs.getInt("battGroupId"));
			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.setBattGroupName(rs.getString("battGroupName"));
			binf.setMonCapStd(rs.getFloat("monCapStd"));
			binf.setMonVolStd(rs.getFloat("monVolStd"));