From d9505757da1a789c4bb9f7c05e8bfd1f09b77ba1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 09:25:33 +0800
Subject: [PATCH] 修改报告预览数据接口
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 3dcab6f..ab1509d 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -1,18 +1,19 @@
<?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.InstrumentMapper">
-
<select id="getListInstrumentInformation" resultType="map">
SELECT i.`id`, i.`equipment_code`, i.`equipment_name`, i.`specifications_models`, u.`name`,
- DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') termValidity, i.`conditions`, i.`storage_place`
+ DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') termValidity,
+ i.`conditions`, i.`storage_place`
FROM instrument i, `user` u
WHERE i.`state` = 1
- AND i.`classify_id` = #{classifyId}
+ AND i.`classify_id` = #{classifyId}
<if test="conditions != null">
AND i.`conditions` = #{conditions}
</if>
<if test="numberOrNameOrSpecifications != null and numberOrNameOrSpecifications != ''">
- AND CONCAT(i.`equipment_code`, i.`equipment_name`, i.`specifications_models`) LIKE CONCAT('%',#{numberOrNameOrSpecifications},'%')
+ AND CONCAT(i.`equipment_code`, i.`equipment_name`, i.`specifications_models`) LIKE
+ CONCAT('%',#{numberOrNameOrSpecifications},'%')
</if>
<if test="whetherWhether == true">
AND DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') <![CDATA[<]]> NOW()
@@ -20,4 +21,29 @@
AND i.`user_id` = u.`id`
</select>
+ <!--閫夋嫨璁惧-->
+ <resultMap id="chooseinstumMap" type="map">
+ <id property="id" column="cid"/>
+ <result property="name" column="father_name"/>
+ <collection property="children" resultMap="chooseinstumTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="chooseinstumTowMap" type="map">
+ <id property="id" column="cid"/>
+ <result property="name" column="son_name"/>
+ <collection property="children" resultMap="chooseinstumTowsMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="chooseinstumTowsMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ </resultMap>
+ <select id="chooseinstum" resultMap="chooseinstumMap">
+ select c.id cid,
+ instrument.id,
+ father_name ,
+ son_name ,
+ equipment_name name
+ from lims_laboratory.instrument
+ left join lims_laboratory.classify c on c.id = instrument.classify_id
+ where conditions in(1,5)
+ </select>
</mapper>
--
Gitblit v1.9.3