From 95831e5932a2571feaeb8cbc9bba3bfbdb1667fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 10:58:42 +0800
Subject: [PATCH] 修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 875b650..0780007 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
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.service.impl;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -133,6 +134,7 @@
RawMaterial rawMaterial = new RawMaterial();
rawMaterial.setId(inspectionVo.getId());
rawMaterial.setType(1);
+ rawMaterial.setInspectionDate(DateUtil.date());
rawMaterial.setSurveyor(userMapper.selectById(id).getName());
rawMaterialMapper.updateById(rawMaterial);
}
@@ -195,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) {
@@ -234,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 -> {
//灏嗕竴涓璞＄殑鍊艰祴鍊肩粰鍙︿竴涓璞�
@@ -253,6 +260,7 @@
}
//椤圭洰鍏宠仈鐗╂枡id
insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
+ insProductVo.setId(insProduct.getId());
return insProductVo;
}).collect(Collectors.toList());
inspectDetailVo.setInsProducts(insProductVos);
--
Gitblit v1.9.3