From fd77d548a62649faabcecd1c33352aa28cf8fead Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 12:03:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/BatttestdataAction.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index ab48698..8010397 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -6,7 +6,7 @@
 import com.fgkj.services.Batttestdata_infService;
 import com.opensymphony.xwork2.ActionSupport;
 
-public class BatttestdataAction extends ActionSupport {
+public class BatttestdataAction extends ActionUtil{
 	private BatttestdataService service = new BatttestdataService();
 	private String result;
 	private Batttestdata btd;
@@ -33,6 +33,19 @@
 		//System.out.println("*************************");
 		return SUCCESS;
 	}
+	
+	/**
+	 * 鍘嗗彶鏁版嵁鏌ヨ			<!-------------  璺ㄥ煙璁块棶 -------------------->
+	 * @return
+	 */
+	public String findhistory_ky(){
+		isAllowHeaders();
+		ServiceModel model = new ServiceModel();
+		model = service.serchByCondition_ky(btd);
+		result = ActionUtil.tojson(model);
+		//System.out.println("*************************");
+		return SUCCESS;
+	}
 
 	
 	public void setBtd(Batttestdata btd) {

--
Gitblit v1.9.1