0630
This commit is contained in:
parent
9bbfbeed16
commit
8b5413eaa7
@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import lombok.Data;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@ -53,9 +54,9 @@ public class CommissionExportVO {
|
||||
private String checkName;
|
||||
|
||||
@ExcelProperty(value = "审核时间", index = 10)
|
||||
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||
// @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||
@ColumnWidth(20)
|
||||
private Date createTime;
|
||||
private String createTimeStr;
|
||||
|
||||
@ExcelProperty(value = "备注", index = 11)
|
||||
private String checkRemark;
|
||||
@ -80,4 +81,12 @@ public class CommissionExportVO {
|
||||
private Integer startPage;
|
||||
@ExcelIgnore
|
||||
private Integer endPage;
|
||||
|
||||
|
||||
public void setCreateTime(Date createTime) {
|
||||
if (createTime != null) {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
this.createTimeStr = sdf.format(createTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
@ -29,10 +30,20 @@ public class CourseOrderExportVO {
|
||||
@ExcelProperty(value = "学员手机号", index = 3)
|
||||
private String studentPhone;
|
||||
|
||||
@ExcelProperty(value = "学员报名时间", index = 4)
|
||||
@DateTimeFormat("yyyy-MM-dd")
|
||||
/*@ExcelProperty(value = "学员报名时间", index = 4)
|
||||
@DateTimeFormat("yyyy-MM-dd")*/
|
||||
@ExcelIgnore
|
||||
private Date signUpTime;
|
||||
|
||||
@ExcelProperty(value = "学员报名时间", index = 4)
|
||||
private String signUpTimeStr;
|
||||
|
||||
public void setSignUpTime(Date signUpTime) {
|
||||
if (signUpTime != null) {
|
||||
this.signUpTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(signUpTime);
|
||||
}
|
||||
}
|
||||
|
||||
@ExcelIgnore
|
||||
private Long courseId;
|
||||
|
||||
@ -45,9 +56,18 @@ public class CourseOrderExportVO {
|
||||
@ExcelProperty(value = "缴费金额", index = 7)
|
||||
private BigDecimal reserveMoney;
|
||||
|
||||
@ExcelProperty(value = "缴费时间", index = 8)
|
||||
@DateTimeFormat("yyyy-MM-dd")
|
||||
/*@ExcelProperty(value = "缴费时间", index = 8)
|
||||
@DateTimeFormat("yyyy-MM-dd")*/
|
||||
@ExcelIgnore
|
||||
private Date payFeesTime;
|
||||
@ExcelProperty(value = "缴费时间", index = 8)
|
||||
private String payFeesTimeStr;
|
||||
|
||||
public void setPayFeesTimeStr(Date payFeesTime) {
|
||||
if (payFeesTime != null) {
|
||||
this.payFeesTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(payFeesTime);
|
||||
}
|
||||
}
|
||||
|
||||
@ExcelProperty(value = "订单备注", index = 9)
|
||||
private String orderRemark;
|
||||
@ -83,9 +103,19 @@ public class CourseOrderExportVO {
|
||||
@ExcelIgnore
|
||||
private Integer cashierConfirm;
|
||||
|
||||
@ExcelProperty(value = "出纳确认时间", index = 17)
|
||||
/*@ExcelProperty(value = "出纳确认时间", index = 17)*/
|
||||
@ExcelIgnore
|
||||
private Date cashierConfirmTime;
|
||||
|
||||
@ExcelProperty(value = "出纳确认时间", index = 17)
|
||||
private String cashierConfirmTimeStr;
|
||||
|
||||
public void setCashierConfirmTime(Date cashierConfirmTime) {
|
||||
if (cashierConfirmTime != null) {
|
||||
this.cashierConfirmTimeStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cashierConfirmTime);
|
||||
}
|
||||
}
|
||||
|
||||
@ExcelProperty(value = "出纳备注", index = 18)
|
||||
private String cashierConfirmRemark;
|
||||
|
||||
@ -154,4 +184,5 @@ public class CourseOrderExportVO {
|
||||
return "未知状态";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user