From 63adab99b71d696863221613cf78b1ea8f02a4e4 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 09 五月 2024 17:46:15 +0800
Subject: [PATCH] bug修复
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 6a40450..8d05746 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -23,7 +23,7 @@
@RestController
@RequestMapping("/insReport")
-@AllArgsConstructor
+//@AllArgsConstructor
@Api("妫�楠屾姤鍛�")
public class InsReportController {
@@ -32,6 +32,7 @@
@Value("${wordUrl}")
private String wordUrl;
+
@ValueAuth
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
@PostMapping("/pageInsReport")
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 28eea7e..e368c32 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
@@ -77,7 +77,7 @@
insOrderMapper.updateById(insOrder);
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).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
for (InsProduct insProduct : insProducts) {
InsOrderState insOrderState = new InsOrderState();
insOrderState.setInsOrderId(orderId);
--
Gitblit v1.9.3