From bad0eff27a0352b8a45f0f3ecb2a5e635bc1af11 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 30 一月 2026 15:35:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen
---
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index a55669e..f0299d1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -57,7 +57,7 @@
group by device_id
) latest on t2.id = latest.device_id
left join project t3 on t1.project_id = t3.id
- where 1=1
+ where t1.deleted = 0
<if test="query.projectId != null">
and t1.project_id = #{query.projectId}
</if>
@@ -73,12 +73,7 @@
<if test="query.content!= null and query.content!=''">
and t2.name like CONCAT('%', #{query.content}, '%')
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and latest.record_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=latest.record_time
- </if>
+
order by latest.record_time desc
</select>
<select id="projectList" resultType="com.ruoyi.system.vo.EntrustProjectVo">
@@ -129,11 +124,13 @@
<select id="errorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,t6.state as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ left join error_review t6 on t1.error_review_id = t6.id
where t1.deleted = 0 and t2.deleted = 0 and t1.`level` =0
<if test="query.recordIds != null">
and t1.id in
@@ -145,8 +142,17 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
<if test="query.type != null and query.type == 1">
and t1.device_id is null
@@ -154,12 +160,7 @@
<if test="query.type != null and query.type == 2">
and t1.device_id is not null
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
+
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
@@ -173,11 +174,14 @@
<select id="deviceErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,t6.state as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ left join error_review t6 on t1.error_review_id = t6.id
+
where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null
<if test="query.recordIds != null">
and t1.id in
@@ -188,16 +192,19 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
@@ -211,12 +218,15 @@
<select id="safetyErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,t6.state as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
- where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is null
+ left join error_review t6 on t1.error_review_id = t6.id
+
+ where t1.deleted = 0 and t1.device_id is null
<if test="query.recordIds != null">
and t1.id in
<foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
@@ -226,16 +236,19 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
--
Gitblit v1.7.1