From 9f59a999252356393adcb2c0cdf3aaa3ca74dfa7 Mon Sep 17 00:00:00 2001 From: LiJun <LiJun@192.168.10.24> Date: 星期三, 14 十一月 2018 16:49:44 +0800 Subject: [PATCH] 电池组的组端信息和电池组的单体信息<---------跨域访问---------> --- gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java index a13256c..95ea981 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java @@ -480,11 +480,11 @@ 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()){ + if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){ sdata.setMon_num(-1); break; } - if(sdata.getMon_num()==brinf.getNew_monum()){ + if(sdata.getMon_num()==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){ sdata.setNote(brinf.getOld_battproducer()); break; } -- Gitblit v1.9.1