From 9049b77f12ec8e41f533be100132ea71163af35e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 16:44:29 +0800
Subject: [PATCH] 修改委托信息
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 29 +++++++++++++++++++++++++----
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 15 ++++++++++-----
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 5 ++++-
4 files changed, 40 insertions(+), 11 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 bb9dc67..704deb9 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
@@ -7,7 +7,9 @@
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
+import com.yuanchu.limslaboratory.mapper.LinkDetectionMapper;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.InspectionService;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
@@ -47,6 +49,9 @@
@Resource
private InspectionService inspectionService;
+
+ @Resource
+ private LinkDetectionMapper linkDetectionMapper;
@ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
@@ -103,13 +108,12 @@
@ApiOperation("閫夋嫨鐗堟湰")
@GetMapping("/chooseVer")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "mcode", value = "浜у搧缂栧彿", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true)
+ @ApiImplicitParam(name = "id", value = "id", dataTypeClass = String.class, required = true),
})
@AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
- public Result<?> chooseVer(String name, String mcode, String specifications) {
- return Result.success(inspectionService.chooseVer(name, mcode, specifications));
+ public Result<?> chooseVer(String name, String id, String specifications) {
+ LinkDetection linkDetection = linkDetectionMapper.selectById(id);
+ return Result.success(linkBasicInformationService.chooseVer(linkDetection));
}
@@ -134,6 +138,7 @@
public Result addInspect(@RequestHeader("X-Token") String token, @Validated @RequestBody InspectionVo inspectionVo) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ LinkDetection linkDetection = linkDetectionMapper.selectById(inspectionVo.getId());
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
index c5a6db3..e89fdd1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import org.springframework.transaction.annotation.Transactional;
@@ -45,5 +46,7 @@
Specifications getSpecificationsName(String id);
- Object lookProByVer(String name, String mcode, String specifications,Integer version, Integer id);
+ List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications,Integer version, Integer id);
+
+ Object chooseVer(LinkDetection linkDetection);
}
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..96a7fc0 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;
@@ -48,6 +50,9 @@
@Resource
private InspectionService inspectionService;
+
+ @Resource
+ private ProductMapper productMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -136,13 +141,29 @@
}
@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());
+ 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) {
+ 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()));
+ }
}
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 9a81cae..1a796c0 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -71,7 +71,7 @@
ld.experiment experiment,
ld.samples_number samplesNumber,
ld.remarks remarks,
- s.name speName
+ ld.spe_name speName
FROM link_basic_information lb left join
link_detection ld
on lb.id = ld.link_basic_id
--
Gitblit v1.9.3