81041
2018-10-11 807286982fd415661cdc1b164d00b4822e5b2516
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,43 @@
      }
      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());
                  }
               }
                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 +909,7 @@
      b.setFbsDeviceIp_WG_old("192.168.0.1");
      b.setStationName("");
      b.setStationName1("");
      b.setStationName2("");
      b.setStationName2("武汉市");
      b.setStationName9("");
      b.setBattGroupName("");
      b.setStationId("42070463");