From 1c683ded6a17523c47d7e1d853736562007d26bc Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 03 六月 2024 09:07:34 +0800
Subject: [PATCH] 完成光纤配置进行检验操作
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a3de060..6c98fa7 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
@@ -80,7 +80,11 @@
sampleOrderDto.setCreateUser(map1.get("userId"));
}else {
//缁勭粐
- sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
+ try {
+ sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
+ }catch (NullPointerException e){
+ throw new ErrorException("鎵句笉鍒版墍灞炲崟浣�");
+ }
}
}
Map<String, Object> map = new HashMap<>();
@@ -99,7 +103,7 @@
insOrderMapper.updateById(insOrder);
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).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);
@@ -125,7 +129,7 @@
@Transactional(rollbackFor = Exception.class)
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
insOrder.setState(0);
- String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
+ String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
insOrderMapper.insert(insOrder);
list.forEach(a -> {
@@ -140,7 +144,7 @@
}
if (ObjectUtil.isNotEmpty(a.getBushing())) {
for (BushingDto bushingDto : a.getBushing()) {
- bushingDto.setInsSampleId(a.getInsOrderId());
+ bushingDto.setInsSampleId(a.getId());
insBushingMapper.insert(bushingDto);
if(bushingDto.getFiber().size()!=0){
for (FiberDto fiberDto : bushingDto.getFiber()) {
--
Gitblit v1.9.3