From 41b665baf7d110716c06e47d19f902fec37a1c57 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:36 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 6 +++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java | 3 +++
sys/src/main/resources/application-dev.yml | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
index 832e4ca..c22b3fa 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
@@ -79,4 +79,7 @@
@ApiModelProperty(value = "妫�楠岀姸鎬�", hidden = true)
private Integer inspectionStatus;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿鍚嶇О", hidden = true)
+ private String speName;
}
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 0896c63..8a857a0 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -69,10 +69,13 @@
ld.unit unit,
ld.experiment experiment,
ld.samples_number samplesNumber,
- ld.remarks remarks
+ ld.remarks remarks,
+ s.name speName
FROM link_basic_information lb left join
link_detection ld
on lb.id = ld.link_basic_id
+ left join specifications s
+ on ld.specifications_models = s.id
where lb.uid = #{uid}
and lb.state = 1
</select>
@@ -100,6 +103,7 @@
<result property="samplesNumber" column="samplesNumber"/>
<result property="remarks" column="remarks"/>
<result property="experiment" column="experiment"/>
+ <result property="speName" column="speName"/>
</collection>
</resultMap>
</mapper>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 62f17fc..c1b729a 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -75,7 +75,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 1000
+ timeout: 2000
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3