From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index fd6ca60..5de0d90 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,10 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductMapper">
- <select id="selectProductByMaterialId" resultType="Product">
- select id, name, method, father, unit, required, internal
- from product
- where material_id = #{material_id}
- and state = 1
+ <select id="selectProductByMaterialId" resultType="Map">
+ select p.name, unit, required, internal
+ from lims_laboratory.product p,
+ lims_laboratory.specifications sp,
+ lims_laboratory.standard st
+ where specifications_id = sp.id
+ and standard_id = st.id
+ and material_id = #{materialId}
+ </select>
+
+ <!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
+ <select id="pageProductInformation" resultType="java.util.Map">
+ select id,
+ name,
+ father,
+ unit,
+ required,
+ internal
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationsId}
</select>
</mapper>
--
Gitblit v1.9.3