From 6ca12d78daab3ad1dec7f5bd6e1f26b6b5fd2f11 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 14:34:42 +0800
Subject: [PATCH] 批量设置放电参数的查询机房

---
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class     |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattInfAction.class    |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/BattInfServices.class |    0 
 gx_tieta/src/com/fgkj/actions/BattInfAction.java                         |    8 +++++++-
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java                          |    6 ++++--
 gx_tieta/src/com/fgkj/services/BattInfServices.java                      |   14 ++++++++++++++
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattInfAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattInfAction.class
index d2ec9ca..c182530 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattInfAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattInfAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
index 4688078..f893dae 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/BattInfServices.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/BattInfServices.class
index 78e7f00..3a7765a 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/BattInfServices.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/BattInfServices.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 518df5e..7279fa7 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -396,7 +396,13 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
-	
+	//鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
+	public String serchByDischarge(){
+		BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+		ServiceModel model = service.serchByDischarge(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
 	//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
 	public String searchInform_ky(){
 		//isAllowHeaders();							//鍏佽璺ㄥ煙璁块棶
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index b39a55b..466cc94 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4377,13 +4377,15 @@
 	//鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
 	public List serchByDischarge(Object obj) {
 		BattInf binf=(BattInf) obj;
+		Page page=binf.getPage();
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
 		String sql=" select SQL_CALC_FOUND_ROWS * from db_battinf.tb_battinf "
 				+ "  where StationName1 like ? and StationName2 like ? and StationName3 like ? and StationName5 like ? "
 				+ "  and GroupIndexInFBSDevice=?   and MonVolStd=? "
-				+ "  order by StationId asc,GroupIndexInFBSDevice asc ";
-		List<BattInf> list=DAOHelper.executeQueryLimit(sql, conn, new Object[] {"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%",binf.getGroupIndexInFBSDevice(),binf.getMonVolStd()}, new CallBack() {
+				+ "  order by StationId asc,GroupIndexInFBSDevice asc "
+				+ "  limit ?,? ";
+		List<BattInf> list=DAOHelper.executeQueryLimit(sql, conn, new Object[] {"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%",binf.getGroupIndexInFBSDevice(),binf.getMonVolStd(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
 			
 			@Override
 			public List getResults(ResultSet rs) {
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index c71ac71..7062ac8 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -1028,6 +1028,20 @@
     	model.setData(battgroupid);
     	return model;
     }
+    
+    //鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
+    public ServiceModel serchByDischarge(Object obj){
+    	List list=((BattInfImpl)dao).serchByDischarge(obj);
+		if (list != null && list.size() > 0) {
+			model.setCode(1);
+			model.setData(list);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
+		}
+		return model;
+    }
     public static void main(String[] args) {
 		//new BattInfServices().findMenu();
 		BattInf b=new BattInf();

--
Gitblit v1.9.1