From ea81424035cc84d97cd114b82918bcbda73d7460 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:41:38 +0800
Subject: [PATCH] screen-manage 型号查询功能完善
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index fbd5d06..3cdf8ef 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -5,8 +5,11 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -18,11 +21,13 @@
**/
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-
public class AccountVO {
+
private Integer id;
private String userName;
+
+ private String account;
private String email;
@@ -30,25 +35,12 @@
private String wechat;
- private String isDelete;
+ private List<ManageRole> roles;
private List<String> roleNames;
- public static AccountVO convert(AccountDTO dto){
- if(dto.getAccount()==null)
- return null;
- AccountVO vo = new AccountVO();
- ManageAccount account = dto.getAccount();
- List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
- vo.setId(account.getId());
- vo.setUserName(account.getUserName());
- vo.setEmail(account.getEmail());
- vo.setMobile(account.getMobile());
- vo.setWechat(account.getWechat());
- vo.setIsDelete(account.getIsDelete());
- vo.setRoleNames(roleNames);
- return vo;
- }
+ private String createTime;
+
+ private String updateTime;
+
}
--
Gitblit v1.8.0