From 55fb959e49a4bce45d7fe646aebde93aca61ef63 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 7 Jun 2024 15:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java | 3 +++ .../main/resources/mapper/scale/SysInterveneRecordMapper.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java index 231b5e7..4bdbd56 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java @@ -41,6 +41,9 @@ public class SysInterveneRecordVo implements Serializable { */ @ExcelProperty(value = "用户id") private Long userId; + @Translation(type = TransConstant.USER_ID_TO_NICKNAME) + @AutoMapping(target = "userId") + private Long userName; /** * 严重度 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 05ec56d..682865b 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,7 +8,7 @@ CONCAT(DATE_FORMAT(ir.create_time, '%Y-%m-%d'), ' ', u.nick_name, '的干预') as `name`, ir.create_time as `time`, 'intervene' as `type`, - ir.annex + ir.diagnose_annex as `annex` from sys_intervene_record ir left join sys_user u on u.user_id = ir.counselor_id where ir.user_id = #{userId}