From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能：支持数据填充，发现单元格合并bug，发现模板重复
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index ac14df2..7f8d103 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -60,17 +60,13 @@
</select>
<select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
select id,
- authorized_person,
- status
+ 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>
@@ -122,7 +118,6 @@
id=#{id}
</where>
</update>
-
<select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
select (image_upload, create_user, create_time) values (#{image_upload}
, #{createUser}
--
Gitblit v1.9.3