From bb79df40aa4c1c80f294f2d1965304a3215744cb Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 17:24:50 +0800
Subject: [PATCH] 修改委托信息
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 23 ++++++++++++++++-------
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java | 5 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 4 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 7 ++++++-
4 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 704deb9..8523b82 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -139,6 +139,10 @@
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
LinkDetection linkDetection = linkDetectionMapper.selectById(inspectionVo.getId());
+ inspectionVo.setMcode(linkDetection.getSampleNumber());
+ inspectionVo.setExperiment(linkDetection.getExperiment());
+ inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
+ inspectionVo.setUnit(linkDetection.getUnit());
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
index 7636b67..1e5e1cd 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
@@ -100,4 +100,9 @@
@JsonSerialize
@NotNull(message = "妫�楠岄」鐩増鏈笉鑳戒负绌�")
private Integer version;
+
+ /**
+ * 鍨嬪彿id
+ */
+ private String specificationId;
}
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 639bcb0..37cfb30 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
@@ -159,7 +159,12 @@
inspectionMaterialMapper.insert(inspectionMaterial);
/*鏂板妫�楠岄」鐩〃*/
//鏍规嵁鏍峰搧鍚嶇О缂栧彿浠ュ強鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id
- Integer specificationId = getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
+ Integer specificationId = null;
+ if(ObjectUtils.isNotEmpty(inspectionVo.getSpecificationId())){
+ specificationId =Integer.parseInt(inspectionVo.getSpecificationId());
+ }else{
+ specificationId=getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
+ }
//濡傛灉璇曢獙椤圭洰瀛楁涓嶄负绌哄垯鎸夎瀛楁鐨勯」鐩繘琛屽尮閰�
if (ObjectUtils.isNotEmpty(inspectionVo.getExperiment())) {
//鑾峰彇璇曢獙椤圭洰淇℃伅(缁撴瀯,瀵肩嚎澶栧緞)
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 96a7fc0..895673c 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
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -57,17 +58,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String addLinkBasicInformation(LinkBasicInformation linkBasicInformation) {
- System.out.println(linkBasicInformation.getLinkDetectionList());
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(true);
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.size()<1){
+ //鎵ц鍒犻櫎
+ linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
+ linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
+ b.set(false);
+ }else {
+ b.set(true);
+ }
});
+ if(b.get()){
+ return "鎻愪氦澶辫触锛屽惈鏈夊凡鎶ユ鏍峰搧";
+ }
//濮旀墭缂栧彿
String code = MyUtil.getTimeSixNumberCode("SL", "SL");
linkBasicInformation.setEntrustCoding(code);
@@ -143,10 +155,7 @@
@Override
public List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications,Integer version, Integer id) {
LinkDetection linkDetection = linkDetectionMapper.selectById(id);
- System.out.println(linkDetection);
List<String> experiments = Arrays.stream(linkDetection.getExperiment().split(",")).collect(Collectors.toList());
- System.out.println(experiments);
- System.out.println("==============================");
//鏍规嵁鍨嬪彿id鍜岄」鐩俊鎭煡璇㈤」鐩俊鎭�
List<Map<String, Object>> products = new ArrayList<>();
for (String exper : experiments) {
--
Gitblit v1.9.3