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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 20a0820..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
@@ -78,6 +78,34 @@
return mmPredictItemDao.selectById(id);
}
+ @Override
+ public List<MmPredictItemRespVO> getDoubleOutPutsByItemNos(List<String> itemNos) {
+ List<Integer> resultType = new ArrayList<Integer>(){{
+ add(3);
+ }};
+ return getOutPutsByItemNosAndResultType(itemNos,resultType);
+ }
+
+ @Override
+ public List<MmPredictItemRespVO> getArrayOutPutsByItemNos(List<String> itemNos) {
+ List<Integer> resultType = new ArrayList<Integer>(){{
+ add(1);
+ add(2);
+ }};
+ return getOutPutsByItemNosAndResultType(itemNos,resultType);
+ }
+
+ public List<MmPredictItemRespVO> getOutPutsByItemNosAndResultType(List<String> itemNos,List<Integer> resultType) {
+ if (CollectionUtils.isEmpty(itemNos) || CollectionUtils.isEmpty(resultType)) {
+ return new ArrayList<>();
+ }
+ Map<String, Object> params = new HashMap(1);
+ params.put("itemNos", itemNos);
+ params.put("resultType", resultType);
+ List<MmPredictItemRespVO> list = mmPredictItemDao.getOutPutsByItemNosAndResultType(params);
+ return list;
+ }
+
@DSTransactional(rollbackFor = Exception.class)
@Override
public void add(MmPredictItemDTO mmPredictItemDto) {
@@ -123,6 +151,11 @@
MmItemOutputEntity entity = new MmItemOutputEntity();
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);
}
@@ -168,7 +201,28 @@
MmPredictMergeItemEntity mMmPredictMergeItem = mmPredictItemDto.getMmPredictMergeItem();
mmPredictMergeItemService.update(mMmPredictMergeItem);
// 修改默认output
- mmPredictItemDto.getMmItemOutputList().forEach(e -> e.setPointid(mmPredictItemDto.getPointId()));
+ List<MmItemOutputEntity> mmItemOutputList = mmPredictItemDto.getMmItemOutputList();
+ if (CollectionUtils.isEmpty(mmItemOutputList)) {
+ mmItemOutputList = new ArrayList<>(1);
+ MmItemOutputEntity entity = new MmItemOutputEntity();
+ 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(entity -> {
+ entity.setPointid(mmPredictItemDto.getPointId());
+ //累计配置
+ entity.setIscumulant(mmPredictItemDto.getIscumulant());
+ entity.setCumuldivisor(mmPredictItemDto.getCumuldivisor());
+ entity.setCumulpoint(mmPredictItemDto.getCumulpoint());
+ });
+ }
}
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
if (!"".equals(dmModuleItem.getId()) && dmModuleItem.getId() != null) {
@@ -226,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