From 280ca0c6a4a1e73ab4516d4850dedb5a43541594 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 20 一月 2025 15:25:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
index 0408818..6f5da02 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
@@ -16,14 +16,14 @@
import com.iailab.module.data.ind.item.vo.IndItemPageReqVO;
import com.iailab.module.data.ind.item.vo.IndItemRespVO;
import com.iailab.module.data.ind.item.vo.IndItemSaveReqVO;
-import com.iailab.module.data.point.common.IncreaseCodeEnum;
+import com.iailab.module.data.common.enums.IncreaseCodeEnum;
import com.iailab.module.data.point.service.DaSequenceNumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
/**
@@ -85,6 +85,16 @@
public void update(IndItemSaveReqVO updateReqVO) {
IndItemEntity entity = BeanUtils.toBean(updateReqVO, IndItemEntity.class);
entity.setUpdateTime(new Date());
+ if (ItemTypeEnum.ATOM.getCode().equals(updateReqVO.getItemType())) {
+ IndItemAtomEntity atomEntity = BeanUtils.toBean(updateReqVO.getAtomItem(), IndItemAtomEntity.class);
+ indItemAtomService.updateById(atomEntity);
+ } else if (ItemTypeEnum.DER.getCode().equals(updateReqVO.getItemType())) {
+ IndItemDerEntity derEntity = BeanUtils.toBean(updateReqVO.getDerItem(), IndItemDerEntity.class);
+ indItemDerServiceImpl.updateById(derEntity);
+ } else if (ItemTypeEnum.CAL.getCode().equals(updateReqVO.getItemType())) {
+ IndItemCalEntity calEntity = BeanUtils.toBean(updateReqVO.getCalItem(), IndItemCalEntity.class);
+ indItemCalServiceImpl.updateById(calEntity);
+ }
baseDao.updateById(entity);
}
@@ -118,4 +128,9 @@
public List<IndItemRespVO> getList(IndItemPageReqVO reqVO) {
return baseDao.getItemList(reqVO);
}
+
+ @Override
+ public List<IndItemEntity> getInfoByIds(Set<String> indIds) {
+ return baseDao.selectBatchIds(indIds);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3