From 8abe275e36823f1065300af45e1f7a9a68f549a7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 16:14:40 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/resources/mapper/ProductMapper.xml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 7596baa..6380efd 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,19 +1,111 @@
<?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
- <if test="productCodeOrName != null and productCodeOrName != ''">
- WHERE p.`father` = #{productCodeOrName}
- </if>
- GROUP BY p.`father`
+ <insert id="addProduct">
+ insert
+ product (name,father,unit,state,create_time,update_time,version,specifications_id)
+ value (#{name},#{father},#{unit},1,#{createTime},#{updateTime},#{version},#{specifications_id})
+ </insert>
+ <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="selectOneChildren" resultType="map">
- SELECT p.`id`, p.`unit`, p.`required`, p.`internal`
- FROM product p
- WHERE p.`father` = #{father}
+
+ <!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
+ <resultMap id="pageProductInformationMap" type="map">
+ <id property="name" column="father"/>
+ <collection property="children" resultMap="pageProductInformationTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="pageProductInformationTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <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">
+ select id,
+ name,
+ father,
+ unit,
+ required,
+ internal,
+ version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationsId}
+ and version = #{version}
+ ORDER BY product.`create_time` DESC
+ </select>
+
+ <select id="deleteList">
+ update lims_laboratory.product
+ 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>
+
+ <!--鏍规嵁椤圭洰鐖剁被,鍨嬪彿id,鐗堟湰鏌ヨ浜岀骇璇︽儏-->
+ <select id="selFath" resultMap="pageProductInformationMap">
+ select id,
+ name,
+ father,
+ unit,
+ required,
+ internal,
+ version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationId}
+ and version = #{version}
+ and father = #{exper}
+ </select>
+
+ <!--鏍规嵁椤圭洰鐖剁被涓虹┖,椤圭洰鍚�,鍨嬪彿id,鐗堟湰鏌ヨ-->
+ <select id="selNam" resultType="java.util.Map">
+ select id,
+ name,
+ unit,
+ required,
+ internal,
+ version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationId}
+ and version = #{version}
+ and name = #{exper}
+ and father is null
</select>
</mapper>
--
Gitblit v1.9.3