From dce5044043c3af93b84dae2804f2d54f779e7c1e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:48:50 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-22
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 2 +-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java | 1 +
standard-server/src/main/resources/mapper/MaterialMapper.xml | 35 +++++++++++++++++------------------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index fc0c456..6ddf43e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -59,7 +59,7 @@
return Result.fail("鍒犻櫎澶辫触锛�");
}
- @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�", tags = "猸愨瓙猸愬悗绔皟鏁�")
+ @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鍨嬪彿/鍨嬪彿鍚嶇О", name = "specificationName", dataTypeClass = String.class)
})
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
index 15fa65e..54c77ae 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.pojo.dto.ProductModelDto;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index bb41247..e2f4825 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -31,43 +31,42 @@
</select>
<resultMap id="OneLevelTreeMap" type="Map">
- <id property="id" column="materialId"/>
- <result property="name" column="materialName"/>
+ <id property="type" column="type"/>
<collection property="children" resultMap="TwoLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="TwoLevelTreeMap" type="Map">
- <id property="id" column="standardId"/>
- <result property="name" column="standardName"/>
+ <id property="id" column="materialId"/>
+ <result property="name" column="materialName"/>
<collection property="children" resultMap="ThreeLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="ThreeLevelTreeMap" type="Map">
- <id property="id" column="specificationsId"/>
- <result property="name" column="specificationsName"/>
+ <id property="id" column="standardId"/>
+ <result property="name" column="standardName"/>
<collection property="children" resultMap="FourLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="FourLevelTreeMap" type="Map">
- <id property="id" column="productId"/>
- <result property="name" column="productName"/>
+ <id property="id" column="specificationsId"/>
+ <result property="name" column="specificationsName"/>
</resultMap>
<select id="FourTree" resultMap="OneLevelTreeMap">
- SELECT m.`id` materialId, m.`name` materialName, s.`id` standardId, s.`name` standardName,
- f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName
- FROM lims_laboratory.material m
- LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM lims_laboratory.standard s WHERE s.`state` = 1) s ON m.id =
- s.`material_id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM lims_laboratory.specifications f WHERE f.`state` = 1
+ SELECT m.`type`, m.`id` materialId, m.`name` materialName, s.id standardId, s.name standardName,
+ f.id specificationsId, f.name specificationsName
+ FROM material m
+ LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
+ ON s.material_id = m.`id`
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
<if test="specificationsName != null and specificationsName != ''">
AND f.`name` = #{specificationsName}
- </if>
- ) f ON s.`id` = f.`standard_id`
- LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM lims_laboratory.product p WHERE p.`state` = 1) p ON f.`id` =
- p.`specifications_id`
+ </if>) f
+ ON f.standard_id = s.id
WHERE m.`state` = 1
</select>
+
+
<!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
<select id="selectmater" resultType="java.lang.String">
select name
--
Gitblit v1.9.3