星伟
2018-10-10 9e1664cbb6c02f8a9bfd5ed6fd7087014d73b2d3
gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
@@ -17,6 +17,7 @@
import com.fgkj.db.IDatabaseName;
import com.fgkj.dto.Alarm_param;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.BattInf_Rebuild;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Batttestdata;
import com.fgkj.dto.Batttestdata_inf;
@@ -423,6 +424,7 @@
    //电池配组管理(重要)
    public List serchMakeGroup(Object obj1,Object obj2){
           BattInf binf=(BattInf) obj1;
           List listr=(List) binf.getObj();
          Batttestdata_inf tinf=(Batttestdata_inf) obj2;
          String sql="select num,BattGroupId,test_record_count,test_type,data_new,data_available,record_num,test_starttime,record_time,test_timelong,group_vol," +
               " test_curr,test_cap,mon_num,mon_vol " +
@@ -475,6 +477,18 @@
         if(list!=null&&list.size()>0){
             for(int i=0;i<list.size();i++){
                Batttestdatastop sdata=list.get(i);
                sdata.setNote(binf.getBattProducer());
                for (int j = 0; j < listr.size(); j++) {
                   BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(j);
                  if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
                     sdata.setMon_num(-1);
                     break;
                  }
                  if(sdata.getMon_num()==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
                     sdata.setNote(brinf.getOld_battproducer());
                     break;
                  }
               }
                STDAH=binf.getMonCapStd();
                MonomerVolType=binf.getMonVolStd();