From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/Batt_rtstateService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Batt_rtstateService.java b/gx_tieta/src/com/fgkj/services/Batt_rtstateService.java
index 5138344..e523bc0 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_rtstateService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_rtstateService.java
@@ -23,7 +23,7 @@
model=new ServiceModel();
dao=BaseDAOFactory.getBaseDAO(BaseDAO.BATT_RTSTATE);
}
-
+ //瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅
public ServiceModel serchByCondition(Object obj){
List list=dao.serchByCondition(obj);
if(list!=null && list.size()>0){
@@ -33,7 +33,16 @@
//System.out.println(list);
return model;
}
-
+ //瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅<-------璺ㄥ煙----------->
+ public ServiceModel serchByCondition_ky(Object obj){
+ List list=((Batt_rtstateDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ }
+ //System.out.println(list);
+ return model;
+ }
//9.1鏍规嵁鏌ヨ鐢垫睜缁勫崟浣撶殑瀹炴椂鏁版嵁(鐢垫睜鍗曚綋瀹炴椂淇℃伅)
public ServiceModel serchByMons(Object obj){
List<Batt_State> list=(new Batt_rtstateDAOImpl()).serchMons(obj);
--
Gitblit v1.9.1