From a098897b8b37dd9418a8840a5f89cac92757ab4a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 13 十一月 2018 14:03:05 +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/ram/Fbs9100s_dfu_stateAction.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
index 650bfa2..7167d70 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -1,9 +1,13 @@
package com.fgkj.actions.ram;
+import java.util.List;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.ram.Fbs9100_state;
import com.fgkj.dto.ram.Fbs9100s_dfu_state;
import com.fgkj.services.ram.Fbs9100s_dfu_stateService;
+import com.google.gson.reflect.TypeToken;
public class Fbs9100s_dfu_stateAction extends ActionUtil{
private Fbs9100s_dfu_stateService service = new Fbs9100s_dfu_stateService();
@@ -24,6 +28,13 @@
result=tojson(model);
return SUCCESS;
}
+ //鍗囩骇鐣岄潰瀹炴椂鍒锋柊
+ public String serchByCondition(){
+ List<Integer> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Integer>>(){}.getType());
+ ServiceModel model=service.serchByCondition(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
--
Gitblit v1.9.1