From bc3313efa51f00e128b6d9483becfd71df4e659d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 09 八月 2024 18:14:51 +0800
Subject: [PATCH] 检验单审核添加对应试验室bug解决
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 72 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 33 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 72267d5..cc2ffe8 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
@@ -134,11 +134,14 @@
insOrder.setAppointed(LocalDate.parse(appointed));
insOrder.setSendTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
- List<InsSample> insSamples =
- insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts =
- insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).isNull(InsProduct::getInsFibersId).isNull(InsProduct::getInsFiberId).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .in(InsProduct::getInsSampleId, ids)
+ .eq(InsProduct::getState, 1)
+// .isNull(InsProduct::getInsFibersId)
+// .isNull(InsProduct::getInsFiberId)
+ .select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
for (InsProduct insProduct : insProducts) {
InsOrderState insOrderState = new InsOrderState();
insOrderState.setInsOrderId(orderId);
@@ -235,28 +238,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 +343,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) {
@@ -555,6 +558,8 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
+ InsOrder order = insOrderMapper.selectById(insOrder.getId());
+ insOrder.setCompany(order.getCompany());
insOrder.setExamineTime(LocalDateTime.now());
if (insOrder.getState() == 1) {
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
@@ -562,14 +567,15 @@
if (StringUtils.isEmpty(code)) {
code = "";
}
- Custom custom = customMapper.selectById(insOrder.getCompanyId());
+ Custom custom = customMapper.selectById(order.getCompanyId());
+ System.out.println("============="+custom.getCompany());
+ System.out.println("-------------"+order.getCompany());
String code2 = custom.getCode2();
- if (!custom.getCompany().equals(insOrder.getCompany())){
- Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, insOrder.getCompany()));
+ if (!custom.getCompany().equals(order.getCompany())){
+ Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, order.getCompany()));
insOrder.setCompanyId(one.getId());
code2=one.getCode2();
}
- //String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
}
return insOrderMapper.updateById(insOrder);
--
Gitblit v1.9.3