From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/LightReportErrorMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightReportErrorMapper.xml b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
index 20cc56c..bd3db61 100644
--- a/dao/src/main/resources/mapper/LightReportErrorMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
@@ -7,6 +7,7 @@
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightReportError">
<id property="lightReportErrorId" column="light_report_error_id" jdbcType="BIGINT"/>
<result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+ <result property="lightAddress" column="light_address" jdbcType="VARCHAR"/>
<result property="errorCode" column="error_code" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
@@ -26,11 +27,12 @@
AND t2.device_type = 0
LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
+ t1.error_code != 0
<if test="keyword != null and keyword != ''">
AND (
t3.id LIKE CONCAT('%', #{keyword},'%')
OR t3.pole_name LIKE CONCAT('%', #{keyword},'%')
- OR t1.error_code LIKE CONCAT('%', #{keyword},'%')
+ OR t1.device_code LIKE CONCAT('%', #{keyword},'%')
)
</if>
<if test="userid != null">
@@ -42,4 +44,20 @@
</where>
ORDER BY t1.light_report_error_id DESC
</select>
+ <select id="listError" resultType="com.sandu.ximon.dao.bo.LightReportErrorBo"
+ parameterType="java.lang.Long">
+ SELECT
+ t1.*
+ FROM
+ light_report_error t1
+ LEFT JOIN pole t3 ON t1.device_code = t3.device_code
+ WHERE
+ t1.light_report_error_id IN ( SELECT t.max_id FROM ( SELECT Max( light_report_error.light_report_error_id ) AS
+ max_id FROM light_report_error GROUP BY light_report_error.device_code ) AS t )
+ <if test="userid != null">
+ AND t3.client_id = #{userId} OR t3.user_id = #{userId}
+ </if>
+ ORDER BY
+ t1.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.9.3