From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 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..29b90c5 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,10 +1,25 @@
<?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 name,
+ father,
+ unit,
+ required,
+ internal
+ from lims_laboratory.product
+ where state=1
+ and specifications_id=#{specificationsId}
</select>
</mapper>
--
Gitblit v1.9.3