From 032b976ab803a263e734dcdca3ceadaed48f1070 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:51:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27下班合并代码

---
 standard-server/src/main/resources/mapper/ProductMapper.xml |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 960436d..8a2d7fd 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -2,10 +2,19 @@
 <!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="getProductInformation" parameterType="integer" resultType="map">
-        SELECT p.method, ifnull(null, p.father) projectClassification, p.user_id, date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
-               p.unit, p.required, p.internal
+    <select id="pageProductInformation" resultType="map">
+        SELECT COUNT(1) num, p.`father`
         FROM product p
-        where p.id = #{productId}
+        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.`unit`, p.`required`, p.`internal`
+        FROM product p
+        WHERE p.`father` = #{father}
     </select>
 </mapper>

--
Gitblit v1.9.3