From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 十二月 2024 15:29:12 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index b3db4df..7b7aded 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -355,7 +355,7 @@
dianLuUtils.readDianLuFile2(sampleId, insOrderFile);
}
} catch (Exception e) {
- System.err.println("闄勪欢涓婁紶閿欒");
+ throw new ErrorException(e.getMessage());
}
return 0;
}
@@ -765,6 +765,8 @@
.in(InsProductResult2::getInsProductId, insProductResultDtos.getInsProductResult2s().stream().map(InsProductResult2::getInsProductId).distinct().collect(Collectors.toList()))
.eq(InsProductResult2::getNum, orderState.getNum())
.eq(InsProductResult2::getFrequency, insProductResultDtos.getFrequency()));
+ List<InsProductResult2> result2s = new ArrayList<>();
+ List<InsProductUser> insProductUsers = new ArrayList<>();
for (InsProductResult2 insProductResult2 : insProductResultDtos.getInsProductResult2s()) {
InsProduct insProduct = new InsProduct();
insProduct.setId(insProductResult2.getInsProductId());//椤圭洰id
@@ -842,10 +844,13 @@
}
result2.setCreateUser(userId);
result2.setUpdateUser(userId);
- insProductResult2Mapper.insert(result2);
- insProduct.setUpdateUser(userId);
- insProductMapper.updateById(insProduct);
- insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ result2s.add(result2);
+ //insProductResult2Mapper.insert(result2);
+ //insProduct.setUpdateUser(userId);
+ //insProducts.add(insProduct);
+ //insProductMapper.updateById(insProduct);
+ insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ //insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
/*鏇存柊鏍峰搧鐨勬楠岀姸鎬�*/
insSample.setInsState(1);
Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -861,8 +866,10 @@
//濡傛灉鎵�鏈夐」鐩兘鏈夌粨璁�,閭ｄ箞璇ユ牱鍝佺姸鎬佸凡妫�
insSample.setInsState(2);
}
- insSampleMapper.updateById(insSample);
}
+ insProductResult2Mapper.saveBatch(result2s);
+ insProductUserMapper.saveBatch(insProductUsers);
+ insSampleMapper.updateById(insSample);
/*鍒ゆ柇璇ョ珯鐐圭殑妫�楠岄」鐩槸鍚﹀叏閮ㄥ凡妫�*/
int count = insProductMapper.selectInsProductCountByOrderId(insSample.getInsOrderId());
if (count == 0) {
--
Gitblit v1.9.3