From 4800caf0bc511a26624da1b9a9cf34275b6c2c4a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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..1b3c366 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,12 @@
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());
+ inspectionVo.setMcode(linkDetection.getSampleNumber());
+ inspectionVo.setExperiment(linkDetection.getExperiment());
+ inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
+ inspectionVo.setUnit(linkDetection.getUnit());
+ inspectionVo.setNotes(linkDetection.getRemarks());
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
--
Gitblit v1.9.3