From 97998a2cca42a2f9d363292fa2e0877935402494 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 6 Jun 2024 11:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B2=E9=A2=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/scale/domain/vo/TimeAxisVo.java | 4 +--- .../main/resources/mapper/scale/SysInterveneRecordMapper.xml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java index 65d6fae..d0ea408 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java @@ -22,7 +22,5 @@ public class TimeAxisVo { private Integer situation; - private String url; - - private String originalName; + private Long annex; } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml index 9bb44cc..f68b5bd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml @@ -8,11 +8,10 @@ CONCAT(DATE_FORMAT(ir.create_time, '%Y-%m-%d'), ' ', u.nick_name, '的干预') as `name`, ir.create_time as `time`, 'intervene' as `type`, - o.url, - o.original_name + ir.annex from sys_intervene_record ir left join sys_user u on u.user_id = ir.counselor_id - left join sys_oss o on o.oss_id = ir.annex + where ir.user_id = #{userId}