From cf4efde9b2ec3d661269c0346596aaf789eb54ad Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:24 +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