From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@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..ac4e031 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();
+ btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
+ model = service.serchByCondition_ky(btd);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public void setBtd(Batttestdata btd) {
--
Gitblit v1.9.1