From a3b6c33ffef0db2d67102edf2b56c78a1d2e551d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 15:29:18 +0800
Subject: [PATCH] 检验任务分页查询检验对象改成样品名称
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 4 ++--
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index 7a2681d..2f724d6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -13,8 +13,8 @@
@ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
private String entrustCode;
- @ValueTableShow(value = 2,name = "妫�楠屽璞�")
- private String sampleType;
+ @ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
+ private String sample;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
private String type;
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 3d0ac72..32195f8 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -37,7 +37,7 @@
io.type,
io.appointed,
io.send_time,
- io.sample_type,
+ group_concat(distinct isa.sample,' ') sample,
isu.user_id,
ip.son_laboratory,
io.ins_time
--
Gitblit v1.9.3