test:测试提交

cjl

2023-08-04 0932aa99d471d657456420856e6c7b32fa4797b0

 screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java

@@ -1,13 +1,17 @@
package com.moral.api.pojo.vo.account;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.api.pojo.dto.account.AccountQueryDTO;
import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
import org.springframework.util.ObjectUtils;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -43,7 +47,7 @@
        List<AccountDTO> accountDTOs = dto.getAccountDTOS();
        if (!ObjectUtils.isEmpty(accountDTOs)) {
            for (AccountDTO accountDTO : accountDTOs) {
                AccountVO vo = AccountVO.convert(accountDTO);
                AccountVO vo = convertToQueryPage(accountDTO);
                accountVOs.add(vo);
            }
        }
@@ -55,4 +59,33 @@
        vo.setSize(size);
        return vo;
    }

    public static AccountVO convertToQueryPage(AccountDTO dto) {
        if (dto.getAccount() == null)
            return null;
        AccountVO vo = new AccountVO();
        ManageAccount account = dto.getAccount();
        List<ManageRole> roles = dto.getRoles();
        if(!ObjectUtils.isEmpty(roles)){
            roles.forEach(value-> {
                value.setIsDelete(null);
                value.setCreateTime(null);
                value.setUpdateTime(null);
                value.setDesc(null);
            });
        }
        vo.setId(account.getId());
        vo.setAccount(account.getAccount());
        vo.setUserName(account.getUserName());
        vo.setEmail(account.getEmail());
        vo.setMobile(account.getMobile());
        vo.setWechat(account.getWechat());
        vo.setRoles(roles);
        //Date转换String
        Date createTime = account.getCreateTime();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String createTimeStr = sdf.format(createTime);
        vo.setCreateTime(createTimeStr);
        return vo;
    }
}