dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0630

Browse Source
This commit is contained in:
Lx 2025-06-30 14:34:43 +08:00
parent 9bbfbeed16
commit 8b5413eaa7
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/vo/CommissionExportVO.java
View File

@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data; import lombok.Data;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@Data @Data
@ -53,9 +54,9 @@ public class CommissionExportVO {
private String checkName; private String checkName;
@ExcelProperty(value = "审核时间", index = 10) @ExcelProperty(value = "审核时间", index = 10)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss") // @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(20) @ColumnWidth(20)
private Date createTime; private String createTimeStr;
@ExcelProperty(value = "备注", index = 11) @ExcelProperty(value = "备注", index = 11)
private String checkRemark; private String checkRemark;
@ -80,4 +81,12 @@ public class CommissionExportVO {
private Integer startPage; private Integer startPage;
@ExcelIgnore @ExcelIgnore
private Integer endPage; 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);
}
}
} }

41
dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/vo/CourseOrderExportVO.java
View File

@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
@ -29,10 +30,20 @@ public class CourseOrderExportVO {
@ExcelProperty(value = "学员手机号", index = 3) @ExcelProperty(value = "学员手机号", index = 3)
private String studentPhone; private String studentPhone;
@ExcelProperty(value = "学员报名时间", index = 4) /*@ExcelProperty(value = "学员报名时间", index = 4)
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")*/
@ExcelIgnore
private Date signUpTime; 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 @ExcelIgnore
private Long courseId; private Long courseId;
@ -45,9 +56,18 @@ public class CourseOrderExportVO {
@ExcelProperty(value = "缴费金额", index = 7) @ExcelProperty(value = "缴费金额", index = 7)
private BigDecimal reserveMoney; private BigDecimal reserveMoney;
@ExcelProperty(value = "缴费时间", index = 8) /*@ExcelProperty(value = "缴费时间", index = 8)
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")*/
@ExcelIgnore
private Date payFeesTime; 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) @ExcelProperty(value = "订单备注", index = 9)
private String orderRemark; private String orderRemark;
@ -83,9 +103,19 @@ public class CourseOrderExportVO {
@ExcelIgnore @ExcelIgnore
private Integer cashierConfirm; private Integer cashierConfirm;
@ExcelProperty(value = "出纳确认时间", index = 17) /*@ExcelProperty(value = "出纳确认时间", index = 17)*/
@ExcelIgnore
private Date cashierConfirmTime; 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) @ExcelProperty(value = "出纳备注", index = 18)
private String cashierConfirmRemark; private String cashierConfirmRemark;
@ -154,4 +184,5 @@ public class CourseOrderExportVO {
return "未知状态"; return "未知状态";
} }
} }
} }