From aa890874f3f6ee7e88134493dc29705bc6fd89a3 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.25> Date: 星期一, 22 十月 2018 16:24:27 +0800 Subject: [PATCH] 修改 --- gx_tieta/src/com/fgkj/services/BattInfServices.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java index b81a4fd..ff30955 100644 --- a/gx_tieta/src/com/fgkj/services/BattInfServices.java +++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java @@ -152,6 +152,20 @@ } return model; } + //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭� + public ServiceModel searchInform1(Object obj) { + List<BattInf> list=((BattInfImpl)dao).searchInform1(obj); + if (list != null && list.size() > 0) { + model.setCode(1); + model.setData(list); + model.setMsg("鏌ヨ鎴愬姛!"); + } + else{ + model.setCode(0); + model.setMsg("鏌ヨ澶辫触!"); + } + return model; + } public ServiceModel searchAll() { List list = dao.searchAll(); @@ -858,6 +872,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(); -- Gitblit v1.9.1