|
@@ -221,10 +221,10 @@ public class ExportScheduler {
|
|
|
row.add(vo.getUserId());
|
|
row.add(vo.getUserId());
|
|
|
row.add(vo.getUserName());
|
|
row.add(vo.getUserName());
|
|
|
row.add(vo.getUserPhone());
|
|
row.add(vo.getUserPhone());
|
|
|
- row.add(sdf.format(vo.getCreateTime()));
|
|
|
|
|
|
|
+ row.add(ObjectUtils.isNull(vo.getCreateTime()) ? "" : sdf.format(vo.getCreateTime()));
|
|
|
row.add(StrUtil.equals(vo.getPayType(), "1") ? "微信支付" : (StrUtil.equals(vo.getPayType(), "2") ? "余额支付" : "暖心照顾"));
|
|
row.add(StrUtil.equals(vo.getPayType(), "1") ? "微信支付" : (StrUtil.equals(vo.getPayType(), "2") ? "余额支付" : "暖心照顾"));
|
|
|
row.add(vo.getPayAmount());
|
|
row.add(vo.getPayAmount());
|
|
|
- row.add(sdf.format(vo.getExpireTime()));
|
|
|
|
|
|
|
+ row.add(ObjectUtils.isNull(vo.getExpireTime()) ? "" : sdf.format(vo.getExpireTime()));
|
|
|
return row;
|
|
return row;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
data.setRows(rows);
|
|
data.setRows(rows);
|
|
@@ -245,10 +245,10 @@ public class ExportScheduler {
|
|
|
row.add(vo.getName());
|
|
row.add(vo.getName());
|
|
|
row.add(vo.getStudentNumber());
|
|
row.add(vo.getStudentNumber());
|
|
|
row.add(StrUtil.equals(vo.getVerifyStatus(), "0") ? "未认证" : "已认证");
|
|
row.add(StrUtil.equals(vo.getVerifyStatus(), "0") ? "未认证" : "已认证");
|
|
|
- row.add(sdf.format(vo.getCreateTime()));
|
|
|
|
|
|
|
+ row.add(ObjectUtils.isNull(vo.getCreateTime()) ? "" : sdf.format(vo.getCreateTime()));
|
|
|
row.add(vo.getVerifyUserName());
|
|
row.add(vo.getVerifyUserName());
|
|
|
row.add(vo.getVerifyUserPhone());
|
|
row.add(vo.getVerifyUserPhone());
|
|
|
- row.add(sdf.format(vo.getLastVerifyTime()));
|
|
|
|
|
|
|
+ row.add(ObjectUtils.isNull(vo.getLastVerifyTime()) ? "" : sdf.format(vo.getLastVerifyTime()));
|
|
|
return row;
|
|
return row;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
data.setRows(rows);
|
|
data.setRows(rows);
|