From b5693ebbd7e49081b51a2d5ca92b20f107a10abc Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 05 二月 2026 15:00:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index 4bb9a8e..f74dc0b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -124,7 +124,7 @@
<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.description as problemName,IF(t1.device_id is null ,1,2) as type,t2.create_time as checkTime
- ,IF(t6.state is null,0,t6.state) as state
+ ,IF(t6.state is null,0,t6.state+1) 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
@@ -174,7 +174,7 @@
<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.description as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
- ,IF(t6.state is null,0,t6.state) as state
+ ,IF(t6.state is null,0,t6.state+1) 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
@@ -218,7 +218,7 @@
<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.description as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
- ,IF(t6.state is null,0,t6.state) as state
+ ,IF(t6.state is null,0,t6.state+1) 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
--
Gitblit v1.7.1