From dd2554435b9ced61e2a6a06627145fca3bf2685b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 04 九月 2023 17:17:17 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 96d46d3..08ce01b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.exception.ApplicationException;
import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
@@ -21,6 +22,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -83,14 +85,13 @@
//鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
@Override
public List<Integer> chooseVer(String name, String mcode, String specifications) {
- Integer specificationId = getSpecificationId(name, mcode, specifications);
- return productMapper.chooseVersion(specificationId);
+ return productMapper.chooseVersion(Integer.parseInt(specifications));
}
//鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�
@Override
public List<Map<String, Object>> lookProByVer(String name, String mcode, String specifications, Integer version, String experiment) {
- Integer specificationId = getSpecificationId(name, mcode, specifications);
+ Integer specificationId = Integer.parseInt(specifications);
/*濡傛灉璇曢獙椤圭洰涓虹┖鍒欐槸鎴愬搧妫�楠屾垨鑰呭師鏉愭枡妫�楠屽垯鏄睍绀鸿鐗堟湰鐨勬墍鏈夐」鐩楠岃姹傚弬鏁�*/
if (ObjectUtils.isEmpty(experiment)) {
return productMapper.pageProductInformation(specificationId, version);
@@ -119,7 +120,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Integer addInspect(Integer id, InspectionVo inspectionVo) {
+ public Integer addInspect(Integer id, InspectionVo inspectionVo) throws ApplicationException {
/*鏂板妫�楠岀敵璇疯〃*/
Inspection inspection = Inspection.builder()
.startTime(inspectionVo.getStartTime())
@@ -152,6 +153,7 @@
.num(inspectionVo.getNum())
.unit(inspectionVo.getUnit())
.supplier(inspectionVo.getSupplier())
+ .specificationId(inspectionVo.getSpecificationId())
.specifications(inspectionVo.getSpecifications())
.formTime(inspectionVo.getFormTime())
.inspectionId(inspection.getId())
@@ -160,12 +162,12 @@
inspectionMaterialMapper.insert(inspectionMaterial);
/*鏂板妫�楠岄」鐩〃*/
//鏍规嵁鏍峰搧鍚嶇О缂栧彿浠ュ強鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id
- Integer specificationId = null;
- if(ObjectUtils.isNotEmpty(inspectionVo.getSpecificationId())){
- specificationId =Integer.parseInt(inspectionVo.getSpecificationId());
- }else{
- specificationId=getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
- }
+ Integer specificationId = Integer.parseInt(inspectionVo.getSpecificationId());
+ //if(ObjectUtils.isNotEmpty(inspectionVo.getSpecificationId())){
+ // specificationId =Integer.parseInt(inspectionVo.getSpecificationId());
+ //}else{
+ // specificationId=getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
+ //}
//濡傛灉璇曢獙椤圭洰瀛楁涓嶄负绌哄垯鎸夎瀛楁鐨勯」鐩繘琛屽尮閰�
if (ObjectUtils.isNotEmpty(inspectionVo.getExperiment())) {
//鑾峰彇璇曢獙椤圭洰淇℃伅(缁撴瀯,瀵肩嚎澶栧緞)
@@ -207,6 +209,16 @@
productMapper.selectList(Wrappers.<Product>query()
.eq("specifications_id", specificationId)
.eq("version",inspectionVo.getVersion()));
+ productList.stream().forEach(p->{
+ String internal = Optional.ofNullable(p)
+ .map(Product::getInternal)
+ .orElse("绌�");
+ String required = Optional.ofNullable(p)
+ .map(Product::getRequired).orElse("绌�");
+ if(Objects.equals("绌�",internal)||Objects.equals(required,"绌�")) {
+ throw new ApplicationException("500","椤圭洰鐗堟湰涓嶅彲鐢�");
+ }
+ });
//灏嗘煡璇㈢殑椤圭洰淇℃伅鏋勫缓鎴愭楠岄」鐩�
ArrayList<InspectionProduct> list = new ArrayList<>();
for (Product product : productList) {
--
Gitblit v1.9.3