From e395159a34f973fce6ba08fb22ab2d0b09f64d3a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 29 一月 2026 17:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/RecordMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordMapper.xml
index 196b13b..df3b9c9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordMapper.xml
@@ -37,19 +37,22 @@
when t1.device_id is null then 1
else 2
end as type,
- t1.create_time,t1.reformed,t1.responsible_person responsiblePerson
+ t1.create_time,t1.reformed,t1.responsible_person responsiblePerson,
+ case
+ when t5.id is null then 3
+ else t5.state
+ end as state
from record t1
left join problem t2 on t1.problem_id = t2.id
left join task t3 on t1.check_task_id = t3.id
left join plan t4 on t3.plan_id = t4.id
+ left join error_review t5 on t1.error_review_id = t5.id
where t1.deleted = 0 and t1.level is not null
and t1.check_task_id in
<foreach item="item" index="index" collection="taskIds" open="(" separator="," close=")">
#{item}
</foreach>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
- </if>
+
<if test="query.type == null">
and t1.level = 0
</if>
@@ -61,6 +64,9 @@
</if>
) as o where 1=1
+ <if test="query.reformed != null">
+ and o.state = #{query.reformed}
+ </if>
<if test="query.type != null">
and o.type = #{query.type}
</if>
--
Gitblit v1.7.1