|
@@ -88,7 +88,7 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
|
|
List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo();
|
|
List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo();
|
|
for (ReplacementInstrumentCooperation row : pageInfo.getRows()) {
|
|
for (ReplacementInstrumentCooperation row : pageInfo.getRows()) {
|
|
for (ReplacementInstrumentCooperation replacementInstrument : replacementInstruments) {
|
|
for (ReplacementInstrumentCooperation replacementInstrument : replacementInstruments) {
|
|
- if (!row.getCooperationOrganId().equals(replacementInstrument.getCooperationOrganId())) continue;
|
|
|
|
|
|
+ if (!row.getTopicId().equals(replacementInstrument.getId())) continue;
|
|
row.setActiveNum(replacementInstrument.getActiveNum());
|
|
row.setActiveNum(replacementInstrument.getActiveNum());
|
|
row.setReplaceNum(replacementInstrument.getReplaceNum());
|
|
row.setReplaceNum(replacementInstrument.getReplaceNum());
|
|
row.setReplaceScale(new BigDecimal(replacementInstrument.getReplaceNum()).multiply(new BigDecimal(100)).
|
|
row.setReplaceScale(new BigDecimal(replacementInstrument.getReplaceNum()).multiply(new BigDecimal(100)).
|