From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
index 3d1bc60..5dd3eb6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
@@ -152,6 +152,10 @@
entity.setPointid(mmPredictItemDto.getPointId());
entity.setResultName(mmPredictItemDto.getMmPredictItem().getItemname());
entity.setResultstr("result");
+ //累计配置
+ entity.setIscumulant(mmPredictItemDto.getIscumulant());
+ entity.setCumuldivisor(mmPredictItemDto.getCumuldivisor());
+ entity.setCumulpoint(mmPredictItemDto.getCumulpoint());
mergeItemOutput.add(entity);
mmPredictItemDto.setMmItemOutputList(mergeItemOutput);
}
@@ -175,7 +179,6 @@
@Override
public void update(MmPredictItemDTO mmPredictItemDto) {
MmPredictItemEntity predictItem = mmPredictItemDto.getMmPredictItem();
- predictItem.setCumulpoint(predictItem.getCumulpoint() == null? "" : predictItem.getCumulpoint());
predictItem.setUpdateTime(new Date());
mmPredictItemDao.updateById(predictItem);
MmItemTypeEntity itemType = mmItemTypeImpl.getById(predictItem.getItemtypeid());
@@ -205,10 +208,20 @@
entity.setPointid(mmPredictItemDto.getPointId());
entity.setResultName(mmPredictItemDto.getMmPredictItem().getItemname());
entity.setResultstr("result");
+ //累计配置
+ entity.setIscumulant(mmPredictItemDto.getIscumulant());
+ entity.setCumuldivisor(mmPredictItemDto.getCumuldivisor());
+ entity.setCumulpoint(mmPredictItemDto.getCumulpoint());
mmItemOutputList.add(entity);
mmPredictItemDto.setMmItemOutputList(mmItemOutputList);
} else {
- mmPredictItemDto.getMmItemOutputList().forEach(e -> e.setPointid(mmPredictItemDto.getPointId()));
+ mmPredictItemDto.getMmItemOutputList().forEach(entity -> {
+ entity.setPointid(mmPredictItemDto.getPointId());
+ //累计配置
+ entity.setIscumulant(mmPredictItemDto.getIscumulant());
+ entity.setCumuldivisor(mmPredictItemDto.getCumuldivisor());
+ entity.setCumulpoint(mmPredictItemDto.getCumulpoint());
+ });
}
}
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
@@ -267,6 +280,10 @@
mmPredictItemDto.setMmPredictMergeItem(mmPredictMergeItemService.getByItemid(id));
if (!CollectionUtils.isEmpty(mmPredictItemDto.getMmItemOutputList())) {
mmPredictItemDto.setPointId(mmPredictItemDto.getMmItemOutputList().get(0).getPointid());
+ //累计配置
+ mmPredictItemDto.setIscumulant(mmPredictItemDto.getMmItemOutputList().get(0).getIscumulant());
+ mmPredictItemDto.setCumuldivisor(mmPredictItemDto.getMmItemOutputList().get(0).getCumuldivisor());
+ mmPredictItemDto.setCumulpoint(mmPredictItemDto.getMmItemOutputList().get(0).getCumulpoint());
}
}
return mmPredictItemDto;
--
Gitblit v1.9.3