From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java
index 00cbe2c..faa6752 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
-import com.sinata.system.enums.BoxProcessEnum;
-import com.sinata.system.enums.BoxStatusEnum;
import com.sinata.common.exception.ServiceException;
-import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwBox;
@@ -14,6 +11,8 @@
import com.sinata.system.domain.query.MwBoxPageQuery;
import com.sinata.system.domain.vo.BoxStatisticsVO;
import com.sinata.system.domain.vo.MwBoxVO;
+import com.sinata.system.enums.BoxProcessEnum;
+import com.sinata.system.enums.BoxStatusEnum;
import com.sinata.system.mapper.MwBoxMapper;
import com.sinata.system.service.MwBoxService;
import org.springframework.dao.DuplicateKeyException;
@@ -24,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -118,8 +118,14 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void editBatch(List<MwBoxDTO> dtoList) {
- List<MwBox> mwBoxes = BeanUtils.copyToList(dtoList, MwBox.class);
- this.updateBatchById(mwBoxes);
+ public void editBatch(MwBoxDTO dto) {
+ List<Long> idList = dto.getIdList();
+ List<MwBox> boxList = idList.stream().map(id -> {
+ MwBox mwBox = new MwBox();
+ mwBox.setStatus(dto.getStatus());
+ mwBox.setRemark(dto.getRemark());
+ return mwBox;
+ }).collect(Collectors.toList());
+ this.updateBatchById(boxList);
}
}
--
Gitblit v1.7.1