From 69f3d9e338f29af69def24839e9b8cdd276a0472 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 08 八月 2024 11:41:03 +0800
Subject: [PATCH] 检验任务保存优化+模版样式修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 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 b90e55d..18d7db4 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
@@ -101,7 +101,7 @@
}
}
//鍒ゆ柇鏄惁鏄叏閮ㄦ潈闄�
- Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectInsOrderParameter"));
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrderParameter"));
if (ObjectUtils.isEmpty(power)) {
if (map1.get("look") == 1) {
//涓汉
@@ -235,28 +235,28 @@
}
}
//閮戒负绌� 鍙厤缃簡濂楃 杩欑鎯呭喌鍙檺浜庨」鐩槸鍚湁鏉惧绠＄殑
-// else {
-// String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
-// if (collect.contains("鏉惧绠�")){
-// //鑾峰彇妫�楠岄」鐩腑鍖呭惈鏉惧绠＄殑妫�楠岄」鐩�
-// List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("鏉惧绠�")).collect(Collectors.toList());
-// for (InsProduct product : products) {
-// product.setInsBushId(bushingDto.getId());
-// product.setId(null);
-// product.setCreateTime(null);
-// product.setCreateUser(null);
-// product.setUpdateTime(null);
-// product.setUpdateUser(null);
-// product.setInsSampleId(a.getId());
-// if (product.getInspectionItemSubclass() == null) {
-// product.setInspectionItemSubclass("");
-// }
-// insProductMapper.insert(product);
-// }
-// }else {
-// throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
-// }
-// }
+ else {
+ String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
+ if (collect.contains("鏉惧绠�")){
+ //鑾峰彇妫�楠岄」鐩腑鍖呭惈鏉惧绠＄殑妫�楠岄」鐩�
+ List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("鏉惧绠�")).collect(Collectors.toList());
+ for (InsProduct product : products) {
+ product.setInsBushId(bushingDto.getId());
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setCreateUser(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(a.getId());
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
+ }
+ }else {
+ throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
+ }
+ }
}
}
}
@@ -340,9 +340,9 @@
InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
String name = insSampleMapper.selMethodById(sampleId);
for (InsProduct product : productList) {
-// if (product.getInspectionItem().contains("鏉惧绠�")){
-// continue;
-// }
+ if (product.getInspectionItem().contains("鏉惧绠�")){
+ continue;
+ }
if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
//鍒ゆ柇鍏夌紗鐨勬俯搴﹀惊鐜」鐩坊鍔�
if (insOrder.getSampleType().equals("鍏夌紗") && product.getInspectionItem().equals("娓╁害寰幆") && type != 0) {
--
Gitblit v1.9.3