From 2f10da83d8087ed1b47b8edc9ff29ca5248f504d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期一, 15 十月 2018 14:31:52 +0800
Subject: [PATCH] 基站统计

---
 gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java
index a592b88..bc1e702 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java
@@ -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 ?)";
 		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 ?)";
     	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()+"%",
 				        (page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()
 				        
 			}, 
@@ -660,7 +660,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()+"%",
 				        (page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()
 		         	}, 
 					new CallBack() {

--
Gitblit v1.9.1