From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 23 九月 2023 12:39:29 +0800
Subject: [PATCH] 9-23 去鵷雏管理端验证
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
index f357bb4..ae27531 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.mapper.LinkDetectionMapper;
+import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
@@ -21,6 +23,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -49,20 +52,35 @@
@Resource
private InspectionService inspectionService;
+ @Resource
+ private ProductMapper productMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public String addLinkBasicInformation(LinkBasicInformation linkBasicInformation) {
- System.out.println(linkBasicInformation.getLinkDetectionList());
+ System.err.println(linkBasicInformation);
+ System.out.println("============>");
QueryWrapper<LinkBasicInformation> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().select(LinkBasicInformation::getId).eq(LinkBasicInformation::getUid, linkBasicInformation.getUid());
LinkBasicInformation linkBasicInformation1 = linkBasicInformationMapper.selectOne(queryWrapper);
Optional<Integer> optionalId = Optional.ofNullable(linkBasicInformation1)
.map(LinkBasicInformation::getId);
+ AtomicBoolean b=new AtomicBoolean(false);
optionalId.ifPresent(l->{
- //鎵ц鍒犻櫎
- linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
- linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
+ QueryWrapper<LinkDetection>queryWrapperLd = new QueryWrapper<>();
+ queryWrapperLd.lambda().select(LinkDetection::getInspectionStatus).eq(LinkDetection::getLinkBasicId,linkBasicInformation1.getId());
+ List<LinkDetection> linkDetections = linkDetectionMapper.selectList(queryWrapperLd).stream().filter(ld->ld.getInspectionStatus()==2).collect(Collectors.toList());
+ if(linkDetections.isEmpty()){
+ //鎵ц鍒犻櫎
+ linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
+ linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
+ }else {
+ b.set(true);
+ }
});
+ if(b.get()){
+ return "鎻愪氦澶辫触锛屽惈鏈夊凡鎶ユ鏍峰搧";
+ }
//濮旀墭缂栧彿
String code = MyUtil.getTimeSixNumberCode("SL", "SL");
linkBasicInformation.setEntrustCoding(code);
@@ -136,13 +154,26 @@
}
@Override
- public Object lookProByVer(String name, String mcode, String specifications,Integer version, Integer id) {
+ public List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications,Integer version, Integer id) {
LinkDetection linkDetection = linkDetectionMapper.selectById(id);
- return inspectionService.lookProByVer(name, mcode, specifications, version, linkDetection.getExperiment());
+ List<String> experiments = Arrays.stream(linkDetection.getExperiment().split(",")).collect(Collectors.toList());
+ //鏍规嵁鍨嬪彿id鍜岄」鐩俊鎭煡璇㈤」鐩俊鎭�
+ List<Map<String, Object>> products = new ArrayList<>();
+ for (String exper : experiments) {
+ List<Map<String, Object>> list = productMapper.selFath(Integer.parseInt(linkDetection.getSpecificationsModels()), exper, version);
+ if (ObjectUtils.isEmpty(list)) {
+ Map<String, Object> project = productMapper.selNam(Integer.parseInt(linkDetection.getSpecificationsModels()), exper, version);
+ products.add(project);
+ }
+ products.addAll(list);
+ }
+ return products;
}
-
-
+ @Override
+ public Object chooseVer( LinkDetection linkDetection) {
+ return productMapper.chooseVersion(Integer.parseInt(linkDetection.getSpecificationsModels()));
+ }
}
--
Gitblit v1.9.3