From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 2115459..44655bd 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -36,7 +36,7 @@
create_time,
update_user,
update_time,
- status,
+ status
from device
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -46,9 +46,9 @@
<select id="selectEquipmentOverview" resultType="com.yuanchu.mom.pojo.Device">
select * from(
select id,
- deviceName,
- specificationModel,
- deviceStatus,
+ device_name,
+ specification_model,
+ device_status,
create_user,
status,
update_time
@@ -59,28 +59,48 @@
</if>
</select>
<select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
- select *
- from (select id,
- authorized_person,
- status
- from device) a
+ select id,
+ authorized_person
+ from device
</select>
<select id="search" resultType="com.yuanchu.mom.pojo.Device">
select *
- from device
- <where>
- <if test="status!=null">
- and status = #{status}
- </if>
- <if test="deviceName!=null and deviceName!=''">
- and device_name like concat('%',#{deviceName},'%')
- </if>
- <if test="specificationModel!=null and specificationModel!= ''">
- and specification_model = #{specificationModel}
- </if>
- <if test="largeCategory!=null and largeCategory!= ''">
- and large_category = #{largeCategory}
- </if>
- </where>
+ from device
+ <where>
+ <if test="deviceName!=null and deviceName!=''">
+ and device_name like concat('%',#{deviceName},'%')
+ </if>
+ <if test="specificationModel!=null and specificationModel!= ''">
+ and specification_model = #{specificationModel}
+ </if>
+ <if test="largeCategory!=null and largeCategory!= ''">
+ and large_category = #{largeCategory}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
+ select (image_upload, create_user, create_time) values (#{image_upload}
+ , #{createUser}
+ , #{createTime})
+ </select>
+ <select id="selectDevicePrincipal" resultType="com.yuanchu.mom.pojo.Device">
+ select id,
+ equipment_manager
+ from device
+ </select>
+
+ <select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto">
+ select * from(
+ SELECT
+ d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName
+ FROM
+ device d
+ left join `user` u on u.id = d.equipment_manager
+ left join laboratory l on l.id = d.subordinate_departments_id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3