From eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 05c4e11..398bc0d 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -23,6 +23,7 @@
<result property="unit" column="unit"/>
<result property="required" column="required"/>
<result property="internal" column="internal"/>
+ <result property="version" column="version"/>
</resultMap>
<select id="pageProductInformation" resultMap="pageProductInformationMap">
@@ -31,11 +32,13 @@
father,
unit,
required,
- internal
+ internal,
+ version
from lims_laboratory.product
where state = 1
and specifications_id = #{specificationsId}
ORDER BY product.`create_time` DESC
+ and version = #{version}
</select>
<select id="deleteList">
@@ -43,4 +46,29 @@
set state=0
where id in (${ids})
</select>
+
+ <!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-閫夋嫨鐗堟湰-->
+ <select id="chooseVersion" resultType="java.lang.Integer">
+ select distinct version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationsId}
+ order by version desc
+ </select>
+
+ <!--鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)-->
+ <resultMap id="chooseProjects" type="map">
+ <id property="name" column="father"/>
+ <collection property="children" resultMap="chooseProjectTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="chooseProjectTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ </resultMap>
+ <select id="chooseProject" resultMap="chooseProjects">
+ select id, father, name
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{modelId}
+ </select>
</mapper>
--
Gitblit v1.9.3