From f0528386da3b2c5ae38c1699ffea318d37376665 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 27 十一月 2018 17:19:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index eb5a36f..7f09cfc 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -986,10 +986,17 @@
}
//棣栭〉涓婃樉绀哄凡瀹夎鏁板拰鍏ㄩ儴鍩虹珯鏁�
public ServiceModel serchDevice(Object obj){
- int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
- int allNum=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
- model.setSum(allNum);
- model.setNewsum(devNum);
+ //int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ List list=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ //System.out.println(model.getData());
return model;
}
--
Gitblit v1.9.1