From 58c466b4478c553a6543a4b2a69f63af7d45a3eb Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 19 Aug 2024 10:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=BB=8F=E5=8E=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/domain/CounselorExperience.java | 2 +- .../domain/bo/CounselorExperienceBo.java | 6 +++--- .../domain/vo/CounselorExperienceVo.java | 20 +++++++++++++------ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java index 842e967..0cdca0f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java @@ -38,7 +38,7 @@ public class CounselorExperience extends BaseEntity { /** * 经历描述 */ - private String describe; + private String experienceDetail; /** * 经历开始时间 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java index edcc402..d890087 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java @@ -37,10 +37,10 @@ public class CounselorExperienceBo extends BaseEntity { private Long counselorId; /** - * 经历描述 + * 经历详情 */ - @NotBlank(message = "经历描述不能为空", groups = {AddGroup.class, EditGroup.class}) - private String describe; + @NotBlank(message = "经历详情不能为空", groups = {AddGroup.class, EditGroup.class}) + private String experienceDetail; /** * 经历开始时间 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java index b8a34cd..64415d8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java @@ -1,16 +1,16 @@ package org.dromara.scale.domain.vo; -import org.dromara.scale.domain.CounselorExperience; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.scale.domain.CounselorExperience; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -29,16 +29,24 @@ public class CounselorExperienceVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; + + private Long counselorId; + + @Translation(type = TransConstant.USER_ID_TO_NICKNAME) + @AutoMapping(target = "counselorId") + private Long counselorName; + + /** * 经历描述 */ @ExcelProperty(value = "经历描述") - private String describe; + private String experienceDetail; }