Commit ee16676b authored by cy's avatar cy

用户导出修改

parent 1ecffa00
......@@ -378,7 +378,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
// 使用java8新特性的stream流去处理数据,把空的数据过滤掉
List<UserDto> resultBo = list.stream().filter(Objects::nonNull)
.map(t -> UserDto.builder()
.registerTime(t.getRegisterTime())
.registerTime(t.getRegisterTime() == null ? null : t.getRegisterTime())
.source(t.getSource() == 1 ? "PC" : t.getSource() == 2 ? "H5" : "小程序")
.userName(t.getUserName() == null ? null : t.getUserName())
.phone(t.getPhone() == null ? null : t.getPhone())
......@@ -387,11 +387,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
.examType(t.getExamType() == null ? null : t.getExamType() == 1 ? "文化课考生" : t.getExamType() == 2 ? "美术生" : t.getExamType() == 3 ? "体育生" : "文学编导考生")
.sex(t.getSex() == null ? null : t.getSex() == 0 ? "男" : "女")
.rechargeTimes(t.getRechargeTimes())
.weChatMoney(t.getWeChatMoney())
.alipayMoney(t.getAlipayMoney())
.lastLoginTime(t.getLastLoginTime())
.cultureGrade(t.getCultureGrade())
.majorGrade(t.getMajorGrade())
.weChatMoney(t.getWeChatMoney() == null ? null : t.getWeChatMoney())
.alipayMoney(t.getAlipayMoney() == null ? null : t.getAlipayMoney())
.cultureGrade(t.getCultureGrade() == null ? null : t.getCultureGrade())
.majorGrade(t.getMajorGrade() == null ? null : t.getMajorGrade())
.queryLimit(t.getQueryLimit() == null ? null : t.getQueryLimit())
.build()).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment