From c0bbd3356de42175a4bf956d37e85bf74c169d4b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 12:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 580f029..639bcb0 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -197,7 +197,10 @@
return inspection.getId();
}
//濡傛灉璇曢獙椤圭洰涓虹┖鍒欐寜鐓у瀷鍙穒d鍦ㄦ爣鍑嗗簱閲岄潰鍏ㄩ儴鍖归厤
- List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationId));
+ List<Product> productList =
+ productMapper.selectList(Wrappers.<Product>query()
+ .eq("specifications_id", specificationId)
+ .eq("version",inspectionVo.getVersion()));
//灏嗘煡璇㈢殑椤圭洰淇℃伅鏋勫缓鎴愭楠岄」鐩�
ArrayList<InspectionProduct> list = new ArrayList<>();
for (Product product : productList) {
@@ -236,8 +239,10 @@
BeanUtils.copyProperties(inspectionMaterial, inspectDetailVo);
/*鏌ヨ妫�楠屽崟閲岄潰鐨勬楠岄」鐩�,骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
LambdaQueryWrapper<InspectionProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
+ queryWrapper
+ .eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
List<InspectionProduct> inspectionProducts = inspectionProductMapper.selectList(queryWrapper);
+ System.out.println(inspectionProducts);
//杩欓噷鏌ュ埌鐨勮澶噄d鍜屾楠屽憳id瑕佹煡璇㈠悕绉�
List<InsProductVo> insProductVos = inspectionProducts.stream().map(insProduct -> {
//灏嗕竴涓璞＄殑鍊艰祴鍊肩粰鍙︿竴涓璞�
@@ -249,12 +254,13 @@
insProductVo.setInstrumentName(equipmentName);
}
//鑾峰彇鐢ㄦ埛鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
- if (insProduct.getUserId() != null) {
- String userName = userMapper.selectById(insProduct.getUserId()).getName();
+ if (insProduct.getUserProId() != null) {
+ String userName = userMapper.selectById(insProduct.getUserProId()).getName();
insProductVo.setUserName(userName);
}
//椤圭洰鍏宠仈鐗╂枡id
insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
+ insProductVo.setId(insProduct.getId());
return insProductVo;
}).collect(Collectors.toList());
inspectDetailVo.setInsProducts(insProductVos);
--
Gitblit v1.9.3