From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/src/com/fgkj/services/Battalarm_dataService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index 089c074..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,7 +176,7 @@
 	//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ
 	public ServiceModel serchByCondition(Object obj){
 		model=new ServiceModel();
-		List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
+		List list=dao.serchByCondition(obj);
 		if(list!=null && list.size()>1){
 			model.setCode(1);
 			model.setData(list);
@@ -186,6 +186,21 @@
 		}	
 		return model;
 	} 	
+	//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+	public ServiceModel serchByCondition_ky(Object obj){
+		model=new ServiceModel();
+		List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
+		if(list!=null && list.size()>1){
+			model.setCode(1);
+			model.setData(list);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		}else {
+			model.setCode(0);
+			model.setData(list);
+			model.setMsg("鏌ヨ澶辫触!");
+		}	
+		return model;
+	} 	
    
 	//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
 	public ServiceModel serchByInfo(Object obj){

--
Gitblit v1.9.1