From 2f10da83d8087ed1b47b8edc9ff29ca5248f504d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期一, 15 十月 2018 14:31:52 +0800
Subject: [PATCH] 基站统计
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 32fd1b2..bd09022 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -833,11 +833,11 @@
sdata.setMon_num(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
- if((j+1)==brinf.getOld_monum()){
+ if((j+1)==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
sdata.setMon_num(-1);
break;
}
- if((j+1)==brinf.getNew_monum()){
+ if((j+1)==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
sdata.setNote(brinf.getOld_battproducer());
break;
}
@@ -858,6 +858,47 @@
}
return model;
}
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ public ServiceModel serchGroupByInfor(Object obj){
+ List<BattInf> list=((BattInfImpl)dao).serchGroupByInfor(obj);
+ List list_b=new ArrayList();
+ if(list!=null&&list.size()>0){
+ for(int i=0;i<list.size();i++){
+ BattInf binf=list.get(i);
+ List<BattInf_Rebuild> listr=(List<BattInf_Rebuild>) binf.getObj();
+ for (int j = 0; j <binf.getMonCount(); j++) {
+ BattInf b=new BattInf();
+ b.setBattGroupId(binf.getBattGroupId());
+ b.setBattProducer(binf.getBattProducer());
+ b.setStationName(binf.getStationName());
+ b.setBattGroupName(binf.getBattGroupName());
+ b.setMonVolStd(binf.getMonVolStd());
+ b.setMonCapStd(binf.getMonCapStd());
+ b.setStationId(binf.getStationId());
+ b.setMonNum(j+1);
+ for (int z = 0; z < listr.size(); z++) {
+ BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
+ if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){
+ b.setBattProducer(brinf.getOld_battproducer());
+ b.setNum(1);
+ }
+ if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
+ b.setNum(0);
+ }
+ }
+ list_b.add(b);
+ }
+ }
+ model.setCode(1);
+ model.setData(list_b);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+
public static void main(String[] args) {
//new BattInfServices().findMenu();
BattInf b=new BattInf();
@@ -872,7 +913,7 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
- b.setStationName2("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
--
Gitblit v1.9.1