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 | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index e7d4c70..5de0d90 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,29 +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="pageProductInformation" resultType="map">
- SELECT COUNT(1) num, p.`father`
- FROM product p
- WHERE p.`specifications_id` = #{specificationsId}
- <if test="productCodeOrName != null and productCodeOrName != ''">
- AND p.`father` = #{productCodeOrName}
- </if>
- GROUP BY p.`father`
- </select>
-
- <select id="selectOneChildren" resultType="map">
- SELECT p.`id`, p.`name`, p.`unit`, p.`required`, p.`internal`
- FROM product p
- WHERE p.`father` = #{father}
- </select>
<select id="selectProductByMaterialId" resultType="Map">
- select p.name,unit,required,internal
+ 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=st.id
- and material_id=#{materialId}
+ 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