From a0b185043d5a2a710d976acb8c59d3445a836320 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期五, 23 十一月 2018 16:31:29 +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/ram/Bts_station_stateService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
index 30f1e9f..1416cc3 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
@@ -40,9 +40,11 @@
//鏈烘埧鏂數缁熻(棣栭〉涓婄殑楗肩姸鍥�)
public ServiceModel serchPowerOff(Object obj){
int powerNum=((Bts_station_stateImpl)dao).serchByState(obj); //鏂數瀹炴椂鏁�
+ int dianzhanNum=((Bts_station_stateImpl)dao).serchByState_diaozhan(obj); //鎺夌珯瀹炴椂鏁�
int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟
model.setSum(powerNum);
model.setNewsum(devNum);
+ model.setCode(dianzhanNum);
return model;
}
}
--
Gitblit v1.9.1