diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java index ec6924d..e531869 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java @@ -96,6 +96,7 @@ public class ExpertAdminExpertManageAssembler { expertSource = assembleTagName(expertSource); expertAdminExpertManageListVO.setExpertSource(expertSource); } + expertAdminExpertManageListVO.setCreateTime(r.getCreateTime()); return expertAdminExpertManageListVO; }).collect(Collectors.toList()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java index eb03406..ea4f355 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java @@ -456,6 +456,8 @@ public class ExpertUserInfoAssembler { DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.EDU.getKey()))); expertAdminExpertManageListDTO.setRecommendedWay( DictionaryAssembler.toDictionaryFieldInfoList(fieldExpertDictionaryMap.get(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey()))); + + expertAdminExpertManageListDTO.setCreateTime(expertUserFullInfo.getCreateOn()); return expertAdminExpertManageListDTO; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java index 385e418..0d9b62d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java @@ -130,4 +130,9 @@ public class ExpertAdminExpertManageListDTO { * 专家来源 */ private List expertSource; + + /** + * 创建时间 + */ + private LocalDateTime createTime; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/vo/ExpertAdminExpertManageListVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/vo/ExpertAdminExpertManageListVO.java index fdbe9de..4bf848e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/vo/ExpertAdminExpertManageListVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/vo/ExpertAdminExpertManageListVO.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; /** @@ -53,4 +54,7 @@ public class ExpertAdminExpertManageListVO { @ApiModelProperty(value = "专家来源") private List expertSource; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/enumeration/RoleEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/enumeration/RoleEnum.java index 42ca500..29cb918 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/enumeration/RoleEnum.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/enumeration/RoleEnum.java @@ -20,21 +20,21 @@ public enum RoleEnum { /** * 系统角色枚举 */ - NORMAL_MEMBER("普通用户",6), + NORMAL_MEMBER("普通用户", 6), - EXPERT("专家",5), + EXPERT("专家", 5), - COMPANY_MANAGER("单位管理员",4), + COMPANY_MANAGER("单位管理员", 4), - EXPERT_ADMIN("专家管理员",2), + EXPERT_ADMIN("专家管理员", 2), - REGION_MANAGER("区域管理员",3), + REGION_MANAGER("区域管理员", 3), - SUPER_ADMIN("超级管理员",1), + SUPER_ADMIN("超级管理员", 1), - VISITOR("访客",7), + VISITOR("访客", 7), - DASHBOARD("工作台",8); + DASHBOARD("工作台", 8); private final String desc; @@ -43,7 +43,7 @@ public enum RoleEnum { */ private final Integer level; - RoleEnum(String desc,Integer level) { + RoleEnum(String desc, Integer level) { this.desc = desc; this.level = level; } @@ -52,24 +52,24 @@ public enum RoleEnum { return this.name().equals(name); } - public static RoleEnum mathByName(String name){ - if(StringUtils.isBlank(name)){ + public static RoleEnum mathByName(String name) { + if (StringUtils.isBlank(name)) { return null; } - for(RoleEnum roleEnum : RoleEnum.values()){ - if(roleEnum.name().equals(name)){ + for (RoleEnum roleEnum : RoleEnum.values()) { + if (roleEnum.name().equals(name)) { return roleEnum; } } return null; } - public static RoleEnum checkHigherRole(List roleCodes){ + public static RoleEnum checkHigherRole(List roleCodes) { RoleEnum res = null; - for(String roleCode : roleCodes){ + for (String roleCode : roleCodes) { RoleEnum roleEnum = mathByName(roleCode); - if(Objects.isNull(res) || - (Objects.nonNull(roleEnum) && roleEnum.getLevel() < res.getLevel())){ + if (Objects.isNull(res) || + (Objects.nonNull(roleEnum) && roleEnum.getLevel() < res.getLevel())) { res = roleEnum; } }