From 4ed2dce59de4477593a82d9a84b216702417fffd Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.16>
Date: 星期三, 24 十月 2018 11:30:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 0c3c591..88569c2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -70,7 +70,7 @@
if((binf.getBattGroupNum()&32)>1){
sql+=diaozhanSql;
}
- if(binf.getBattGroupNum()>32){
+ if((binf.getBattGroupNum()&16)>1&&(binf.getBattGroupNum()>32)){
sql+=" or ";
}
//寮�闂�
@@ -78,7 +78,7 @@
if((binf.getBattGroupNum()&16)>1){
sql+=dooropenSql;
}
- if(binf.getBattGroupNum()>48){
+ if((binf.getBattGroupNum()&8)>1&&(binf.getBattGroupNum()>16)){
sql+=" or ";
}
//鍙戠數
@@ -86,7 +86,7 @@
if((binf.getBattGroupNum()&8)>1){
sql+=fadianSql;
}
- if(binf.getBattGroupNum()>56){
+ if((binf.getBattGroupNum()&4)>1&&(binf.getBattGroupNum()>8)){
sql+=" or ";
}
//缁埅
@@ -94,7 +94,7 @@
if((binf.getBattGroupNum()&4)>1){
sql+=xuhangSql;
}
- if(binf.getBattGroupNum()>60){
+ if((binf.getBattGroupNum()&2)>1&&(binf.getBattGroupNum()>4)){
sql+=" or ";
}
//鍋滅數
@@ -213,7 +213,7 @@
binf.setStationName2("");
binf.setStationName3("");
binf.setStationId("");
- binf.setBattGroupNum(0);
+ binf.setBattGroupNum(36);
User_inf uinf=new User_inf();
uinf.setUId(1002);
Page p=new Page();
--
Gitblit v1.9.1