From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 3da8183..314bdee 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.mapper.InspectionItemMapper;
+import com.yuanchu.mom.mapper.RawInsProductMapper;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
@@ -42,6 +43,9 @@
//鍘熸潗鏂欐楠屽瓙鏁版嵁
@Autowired
private RawInsProductService rawInsProductService;
+
+ @Resource
+ RawInsProductMapper rawInsProductMapper;
//浜у搧妫�楠�
@Autowired
@@ -87,13 +91,26 @@
// 绛変簬0锛氬師鏉愭枡
if (type == 0) {
// 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
- RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
- RawInspect rawInspect = new RawInspect();
- BeanUtils.copyProperties(map, rawInspect);
+ RawInspect rawInspect = rawInspectService.getById(inspectUnaccepted.getRawInspectId());
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
+ .eq("raw_inspect_id", rawInspect.getId()));
// 淇濆瓨鐖剁骇
+ rawInspect.setId(null);
+ rawInspect.setInsState(0);
+ rawInspect.setJudgeState(null);
+ rawInspect.setInsTime(null);
rawInspectService.save(rawInspect);
// 鎵归噺淇濆瓨瀛愮骇
- rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
+ List<RawInsProduct> rawInsProducts = rawInsProductList.stream().map(rawInsProduct -> {
+ rawInsProduct.setId(null);
+ rawInsProduct.setTestValue(null);
+ rawInsProduct.setTestState(null);
+ rawInsProduct.setDeviceId(null);
+ rawInsProduct.setRawInspectId(rawInspect.getId());
+ rawInsProduct.setUserId(null);
+ return rawInsProduct;
+ }).collect(Collectors.toList());
+ rawInsProductService.saveBatch(rawInsProducts);
}
// 绛変簬1锛氫骇鍝佹楠�(鍗婃垚鍝�)
else if (type == 1) {
--
Gitblit v1.9.3