From 2f967bc373b23a48ff986a965155361a70bd2eb0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期五, 04 一月 2019 15:40:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
index 6908eb2..1c48cbc 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_stateService.java
@@ -71,10 +71,21 @@
}
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇�
public ServiceModel serchByCondition(Object obj){
- List list=new ArrayList();
- Fbs9100_state fs=(Fbs9100_state) obj;
//FBS9100鏁版嵁
- list = dao.serchByCondition(fs);
+ List list = dao.serchByCondition(obj);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇�<-------璺ㄥ煙----------->
+ public ServiceModel serchByCondition_ky(){
+ //FBS9100鏁版嵁
+ List list = ((Fbs9100_stateImpl)dao).serchByCondition_ky();
if(list!=null && list.size()>0){
model.setCode(1);
model.setData(list);
@@ -187,6 +198,18 @@
}
return model;
}
+ //鎵归噺璁剧疆鏀剧數鍙傛暟鏃舵煡璇㈠嚭褰撳墠鏀剧數鐨勭數姹犵粍锛�1u/2u鍒嗗紑锛�
+ public ServiceModel seachDischarge(Object obj){
+ List list=((Fbs9100_stateImpl)dao).seachDischarge(obj);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
public static void main(String[] args) {
Fbs9100_stateService fs = new Fbs9100_stateService();
Fbs9100_state f=new Fbs9100_state();
--
Gitblit v1.9.1