|
|
@@ -51,6 +51,7 @@ import java.io.ByteArrayInputStream;
|
|
|
import java.io.ByteArrayOutputStream;
|
|
|
import java.io.InputStream;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
@@ -212,6 +213,7 @@ public class ExportScheduler {
|
|
|
data.setTitles(Arrays.asList("推广码id", "用户id", "用户名称", "用户手机号", "创建时间", "支付类型", "支付金额", "会员过期时间"));
|
|
|
|
|
|
PageUtils pages = vipPromoRecordService.pages(query);
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
List<List<Object>> rows = pages.getList().stream().map(e -> {
|
|
|
VipPromoRecordVO vo = (VipPromoRecordVO) e;
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
@@ -219,10 +221,10 @@ public class ExportScheduler {
|
|
|
row.add(vo.getUserId());
|
|
|
row.add(vo.getUserName());
|
|
|
row.add(vo.getUserPhone());
|
|
|
- row.add(vo.getCreateTime());
|
|
|
+ row.add(sdf.format(vo.getCreateTime()));
|
|
|
row.add(StrUtil.equals(vo.getPayType(), "1") ? "微信支付" : (StrUtil.equals(vo.getPayType(), "2") ? "余额支付" : "暖心照顾"));
|
|
|
row.add(vo.getPayAmount());
|
|
|
- row.add(vo.getExpireTime());
|
|
|
+ row.add(sdf.format(vo.getExpireTime()));
|
|
|
return row;
|
|
|
}).collect(Collectors.toList());
|
|
|
data.setRows(rows);
|
|
|
@@ -236,16 +238,17 @@ public class ExportScheduler {
|
|
|
data.setName("特殊照顾学生列表");
|
|
|
data.setTitles(Arrays.asList("姓名", "学号", "验证状态", "创建时间", "验证用户名", "验证手机号", "验证时间"));
|
|
|
PageUtils pages = specialFavorStudentService.pages(query);
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
List<List<Object>> rows = pages.getList().stream().map(e -> {
|
|
|
SpecialFavorStudentVO vo = (SpecialFavorStudentVO) e;
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
row.add(vo.getName());
|
|
|
row.add(vo.getStudentNumber());
|
|
|
row.add(StrUtil.equals(vo.getVerifyStatus(), "0") ? "未认证" : "已认证");
|
|
|
- row.add(vo.getCreateTime());
|
|
|
+ row.add(sdf.format(vo.getCreateTime()));
|
|
|
row.add(vo.getVerifyUserName());
|
|
|
row.add(vo.getVerifyUserPhone());
|
|
|
- row.add(vo.getLastVerifyTime());
|
|
|
+ row.add(sdf.format(vo.getLastVerifyTime()));
|
|
|
return row;
|
|
|
}).collect(Collectors.toList());
|
|
|
data.setRows(rows);
|