From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/Batt_rtdataService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Batt_rtdataService.java b/gx_tieta/src/com/fgkj/services/Batt_rtdataService.java
index de05daa..1cced18 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_rtdataService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_rtdataService.java
@@ -16,13 +16,29 @@
model=new ServiceModel();
dao=BaseDAOFactory.getBaseDAO(BaseDAO.BATT_RTDATA);
}
-
+ //瀹炴椂鐩戞祴
public ServiceModel serchByCondition(Object obj){
List list=dao.serchByCondition(obj);
- //System.out.println(list);
if(list!=null && list.size()>0){
model.setCode(1);
model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //瀹炴椂鐩戞祴<-------璺ㄥ煙----------->
+ public ServiceModel serchByCondition_ky(Object obj){
+ List list=((Batt_rtdataDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
}
return model;
}
--
Gitblit v1.9.1