From 3647aa5008055528f075ee73002542a1399575ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 14:45:39 +0800
Subject: [PATCH] 单点登录调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 1d96a2c..8c42108 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
@@ -432,11 +432,13 @@
if(sampleIds.contains(insSample.getId())) {
list = selectTemperatureByProductId(productId);
}else {
+ // 灏嗘俯搴﹀惊鐜痠d杩囨护
+ productIds = productIds.stream().filter(item -> !item.equals(productId)).collect(Collectors.toList());
// 鎾ら攢鐨勬槸妫�楠岄」
- List<InsProduct> productList = insProductMapper.selectList(new LambdaQueryWrapper<InsProduct>()
+ List<InsProduct> productList = insProductMapper.selectList(new LambdaQueryWrapper<InsProduct>()
.eq(InsProduct::getState, 1)
.eq(InsProduct::getSpecialItemParentId,productId)
- .in(InsProduct::getId, productIds));
+ .in(CollectionUtils.isNotEmpty(productIds),InsProduct::getId, productIds));
Map<String, List<InsProduct>> collect = productList.stream().collect(Collectors.groupingBy(InsProduct::getInspectionItem));
// 鎷垮埌寰幆娆℃暟
Iterator<Map.Entry<String, List<InsProduct>>> iterator = collect.entrySet().iterator();
@@ -475,12 +477,14 @@
if(sampleIds.contains(insSample.getId())) {
list = selectTemperatureNumberByProductId(parentId, inspectionItem);
}else {
+ // 杩囨护鍑烘俯搴﹀惊鐜殑id
+ productIds = productIds.stream().filter(item -> !item.equals(parentId)).collect(Collectors.toList());
// 鏌ヨ鎾ら攢鐨勬俯搴︾偣
List<InsProduct> productList = insProductMapper.selectList(new LambdaQueryWrapper<InsProduct>()
.eq(InsProduct::getState, 1)
.eq(InsProduct::getSpecialItemParentId, parentId)
.eq(InsProduct::getInspectionItem, inspectionItem)
- .in(InsProduct::getId, productIds));
+ .in(CollectionUtils.isNotEmpty(productIds),InsProduct::getId, productIds));
// 鏍规嵁妫�楠屽瓙椤瑰緱鍒版俯搴︾偣
Map<String, List<InsProduct>> collect = productList.stream().collect(Collectors.groupingBy(InsProduct::getInspectionItemSubclass));
Iterator<Map.Entry<String, List<InsProduct>>> iterator = collect.entrySet().iterator();
@@ -525,7 +529,16 @@
List<InsProduct> productList = insProductMapper.selectList(new LambdaQueryWrapper<InsProduct>()
.in(InsProduct::getId, productIds));
if(CollectionUtils.isNotEmpty(productList)) {
- // 寰楀垽鏂竴涓� 鏄惁鍚湁娓╁害寰幆椤圭洰
+ // 濡傛灉鎾ら攢鐨勯」鐩槸娓╁害寰幆 閭ｄ箞鐩稿簲鐨勫瓙椤归渶瑕佸叏閮ㄦ挙閿�
+ List<InsProduct> collect3 = productList.stream().filter(item -> item.getInspectionItem().equals("娓╁害寰幆")).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(collect3)) {
+ for (InsProduct a : collect3) {
+ insProductMapper.update(null,new LambdaUpdateWrapper<InsProduct>()
+ .set(InsProduct::getState,0)
+ .eq(InsProduct::getSpecialItemParentId,a.getId()));
+ }
+ }
+ // 濡傛灉鏄煇涓�涓俯搴� 鏄惁鍚湁娓╁害寰幆瀛愰」
List<InsProduct> collect2 = productList.stream().filter(item -> Objects.nonNull(item.getSpecialItemParentId())
&& NumberUtil.isInteger(item.getInspectionItem())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(collect2)) {
--
Gitblit v1.9.3