diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java index bb4bf04..9d40f40 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java @@ -2,9 +2,12 @@ package org.dromara.scale.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.scale.domain.vo.SysScaleVo; import java.io.Serial; import java.math.BigDecimal; @@ -18,7 +21,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_scale") -//@AutoMapper(target = SysScaleVo.class, reverseConvertGenerate = false) +@AutoMapper(target = SysScaleVo.class, reverseConvertGenerate = false) public class SysScale extends TenantEntity { @Serial @@ -63,12 +66,13 @@ public class SysScale extends TenantEntity { /** * 适应人群:对应字典项people_type */ + @AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))") private String peopleType; /** * 适用年龄段:对应字典项age_range */ - + @AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))") private String ageRange; /** @@ -86,7 +90,7 @@ public class SysScale extends TenantEntity { /** * 量表类型:对应字典项scale_type */ - + @AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))") private String scaleType; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java index 5823f5b..ad103c2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java @@ -1,11 +1,9 @@ package org.dromara.scale.domain.vo; -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.SysScale; import java.io.Serial; import java.io.Serializable; @@ -20,7 +18,7 @@ import java.util.List; * @date 2024-03-29 */ @Data -@AutoMapper(target = SysScale.class) +//@AutoMapper(target = SysScale.class) public class SysScaleVo implements Serializable { @Serial @@ -64,7 +62,7 @@ public class SysScaleVo implements Serializable { /** * 适应人群:对应字典项people_type */ - @AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))") + //@AutoMapping(target = "peopleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getPeopleType(), \",\"))") private List peopleType; /** @@ -76,7 +74,7 @@ public class SysScaleVo implements Serializable { /** * 适用年龄段:对应字典项age_range */ - @AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))") + //@AutoMapping(target = "ageRange", expression = "java(cn.hutool.core.util.StrUtil.split(source.getAgeRange(), \",\"))") private List ageRange; /** @@ -105,7 +103,7 @@ public class SysScaleVo implements Serializable { /** * 量表类型:对应字典项scale_type */ - @AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))") + //@AutoMapping(target = "scaleType", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleType(), \",\"))") private List scaleType; /**