From 154b38709aa8151222382240392f120ae5542a69 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 18 二月 2025 15:29:05 +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/MmItemOutputServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
index 3ab68e9..ff058ab 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
@@ -6,6 +6,7 @@
import com.iailab.module.model.mcs.pre.dto.MmItemOutputDTO;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -74,10 +75,21 @@
}
@Override
- public MmItemOutputEntity getByItemid(String itemid, String resultstr) {
+ public MmItemOutputEntity getByItemid(String itemid, String resultstr, String resultIndex) {
QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("itemid", itemid).eq("resultstr", resultstr);
+ queryWrapper.eq("itemid", itemid)
+ .eq("resultstr", resultstr)
+ .eq(StringUtils.isNotBlank(resultIndex), "result_index", resultIndex);
return mmItemOutputDao.selectOne(queryWrapper);
+ }
+
+ @Override
+ public List<MmItemOutputEntity> getByItemid(String itemid, String resultstr, List<Integer> resultIndexs) {
+ QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("itemid", itemid)
+ .eq("resultstr", resultstr)
+ .in(!CollectionUtils.isEmpty(resultIndexs), "result_index", resultIndexs);
+ return mmItemOutputDao.selectList(queryWrapper);
}
@Override
@@ -98,7 +110,9 @@
return outputMap.get(outputid);
}
MmItemOutputEntity entity = mmItemOutputDao.selectById(outputid);
- outputMap.put(outputid, entity);
- return entity;
+ if (entity != null) {
+ outputMap.put(outputid, entity);
+ }
+ return outputMap.get(outputid);
}
}
--
Gitblit v1.9.3