From f31ae33e37895b9517ee6ace6bd703f4bbb47e81 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index bfe50f1..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
@@ -114,7 +114,8 @@
ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -163,7 +164,8 @@
ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -220,9 +222,10 @@
ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
ip.factory ip_factory,
ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
@@ -266,7 +269,6 @@
select ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -317,7 +319,8 @@
select ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -366,7 +369,8 @@
select ip.id ip_id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -440,9 +444,10 @@
<id property="id" column="ip_id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemEn" column="inspection_item_en" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclassEn" column="inspection_item_subclass_en" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClassEn" column="inspection_item_class_en" jdbcType="VARCHAR"/>
<result property="factory" column="ip_factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="ip_laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="ip_sample_type" jdbcType="VARCHAR"/>
--
Gitblit v1.9.3