From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:36 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 6654ad3..54a80ed 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.InsProductBindingDto;
+import com.ruoyi.inspect.dto.InsProductDto;
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsProductMapper;
import com.ruoyi.inspect.mapper.InsSampleMapper;
@@ -21,6 +22,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -179,7 +182,7 @@
for (InsProduct product : insProducts) {
for (InsProduct insProduct1 : insProductBindingList) {
insProduct1.setId(null);
- insProduct1.setBindingProductId(product.getId());
+ insProduct1.setBindingProductId(Math.toIntExact(product.getId()));
insProduct1.setCableTag(product.getCableTag());
}
this.saveBatch(insProductBindingList);
@@ -214,7 +217,27 @@
return false;
}
-
+ /**
+ * 妫�鏌ラ」鐩壒閲忓垎閰嶆楠屼汉
+ *
+ * @param insProductDto
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int batchUpdateInsProductCheckUser(InsProductDto insProductDto) {
+ if(ObjectUtils.isEmpty(insProductDto) || CollectionUtils.isEmpty(insProductDto.getInsProductDtoList())){
+ return 0;
+ }
+ List<InsProductDto> insProductDtoList = insProductDto.getInsProductDtoList();
+ for (InsProductDto productDto : insProductDtoList) {
+ InsProduct insProduct = new InsProduct();
+ insProduct.setId(Long.valueOf(productDto.getInsProductId()));
+ insProduct.setCheckUserId(productDto.getCheckUserId());
+ insProductMapper.updateById(insProduct);
+ }
+ return insProductDtoList.size();
+ }
}
--
Gitblit v1.9.3