From 83c62f5630f75e7c1b0379530f77206a2b90b03f Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 10:58:05 +0800
Subject: [PATCH] 单体信息统计查询添加市级筛选

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

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 954dce4..a3346ad 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1428,14 +1428,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 ? )";
 				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()+"%",(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()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
 						new CallBack() {
 							public List getResults(ResultSet rs) {
 								List list=new ArrayList();
@@ -3473,7 +3473,7 @@
 		
 		BattInfImpl biml = new BattInfImpl();
 		BattInf binf = new BattInf();
-		binf.setBattGroupId(0);
+		binf.setBattGroupId(1000967);
 		binf.setStationName("鍐呰挋鍙�");
 		binf.setStationName1("鍐呰挋鍙�");
 		
@@ -3500,7 +3500,8 @@
 		bmd.setUinf(uinf);
 		//List<BattInf> list = biml.serchByConditionNew(bmd);
 		//List<BattInf> list=biml.serchByTestType(bmd);
-		List<BattInf> list=biml.serchGroupAssess(bmd);
+		//List<BattInf> list=biml.serchGroupAssess(bmd);
+		List<BattInf> list=biml.serchByMonNum(binf);
 		for (BattInf b : list) {
 			System.out.println(b);
 		}

--
Gitblit v1.9.1