From 0a86cfc623812431f41bc0255e9e6e7730e60df0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 16:54:39 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/LightReportErrorMapper.xml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightReportErrorMapper.xml b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
index 9aa98b4..cea33d4 100644
--- a/dao/src/main/resources/mapper/LightReportErrorMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
@@ -5,12 +5,12 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightReportErrorMapper">
<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"/>
+ <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"/>
</resultMap>
<resultMap id="listReportError" type="com.sandu.ximon.dao.bo.LightReportErrorBo" extends="BaseResultMap">
<result property="poleName" column="pole_name" jdbcType="INTEGER"/>
@@ -27,6 +27,7 @@
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},'%')
@@ -46,16 +47,17 @@
<select id="listError" resultType="com.sandu.ximon.dao.bo.LightReportErrorBo"
parameterType="java.lang.Long">
SELECT
- t1.*
+ t1.*
FROM
- light_report_error t1
- LEFT JOIN pole t3 ON t1.device_code = t3.device_code
+ light_report_error t1
+ LEFT JOIN pole t3 ON t1.device_code = t3.device_code
WHERE
- <if test="userid != null">
- t3.client_id = #{userId} OR t3.user_id = #{userId}
- </if>
- 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">
+ t3.client_id = #{userId} OR t3.user_id = #{userId}
+ </if>
+ 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 )
ORDER BY
- t1.create_time DESC
+ t1.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3