From bf233b9eeb959091831bf0b9a11a180fee2b2d51 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 18:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 +--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 02be8fc..6102381 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -632,6 +632,7 @@
Integer insSampleId = product.getInsSampleId();
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
+ //濡傛灉鏈夊涓牱鍝佹垨鑰呮槸涓嶆槸閲囬泦绫诲瀷灏卞悓涓�涓澶�
if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
//瀛樺湪鍏朵綑鏍峰搧,鏌ヨ鏄惁鏈夊悓涓�绉嶆楠岄」鐩�
for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
@@ -673,8 +674,6 @@
}
}
-
-
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 6a1dbcd..cc2ffe8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -137,9 +137,8 @@
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .in(InsProduct::getInsSampleId, ids).
- eq(InsProduct::getState, 1)
- .isNotNull(InsProduct::getInspectionItemClass)
+ .in(InsProduct::getInsSampleId, ids)
+ .eq(InsProduct::getState, 1)
// .isNull(InsProduct::getInsFibersId)
// .isNull(InsProduct::getInsFiberId)
.select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 9de11ba..96f2074 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -91,7 +91,7 @@
return Result.fail(map.get("info"));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
--
Gitblit v1.9.3