From faef2faefa2f7475aa7c88d5a78a52ebda628a51 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 15 八月 2024 10:59:39 +0800
Subject: [PATCH] 检验下单调整2
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
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..e3d738d 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));
@@ -609,7 +608,7 @@
public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(SampleProductDto2.class));
- IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto));
+ IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto),sampleProductDto.getId());
for (SampleProductDto2 record : productDto2IPage.getRecords()) {
InsProductUser insProductUser = insProductUserMapper.selectOne(Wrappers.<InsProductUser>lambdaQuery()
.eq(InsProductUser::getInsProductId, record.getInsProductId())
--
Gitblit v1.9.3