81041
2018-10-22 aa890874f3f6ee7e88134493dc29705bc6fd89a3
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();
@@ -830,7 +844,6 @@
                   Batttestdatastop sdata=new Batttestdatastop();
                   sdata.setBattGroupId(binf.getBattGroupId());
                   sdata.setNote(binf.getBattProducer());
                   sdata.setStationid(binf.getStationId());
                   sdata.setMon_num(j+1);
                   for (int z = 0; z < listr.size(); z++) {
                      BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
@@ -875,11 +888,16 @@
                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);