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/MaterialMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index a14fe8e..8853a62 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -2,14 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
- <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
+ <select id="selectMaterialLimit" resultType="Map">
select id, name
- from material
+ from lims_laboratory.material
where state = 1
+ and type = #{type}
order by create_time desc
- limit #{num1},#{num2}
+ limit #{num1},#{num2}
</select>
- <select id="selectMaterialById" resultType="java.util.Map">
+ <select id="selectMaterialById" resultType="Map">
select m.id,
m.num,
m.supplier,
@@ -22,10 +23,11 @@
s.cross_section crossSection,
s.number_of_cores numberOfCores,
s.instruct
- from material m,
- specifications s,
- serial_number sn
+ from lims_laboratory.material m,
+ lims_laboratory.specifications s,
+ lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
+ and m.id=#{materialId}
</select>
</mapper>
--
Gitblit v1.9.3