From 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 10:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java
index 9ac9182..2a5144d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java
@@ -36,16 +36,28 @@
@ExcelProperty(value = "奖品名称",index = 4)
private String prizeName;
- @ApiModelProperty(value = "奖品图片")
- @ExcelProperty(value = "奖品图片",index = 5)
- private URL imageUrl;
-
@ApiModelProperty(value = "核销人名称")
- @ExcelProperty(value = "核销人",index = 6)
+ @ExcelProperty(value = "核销人",index = 5)
private String staffName;
@ApiModelProperty(value = "核销时间")
- @ExcelProperty(value = "核销时间",index = 7)
+ @ExcelProperty(value = "核销时间",index = 6)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date staffTime;
+
+ @ExcelProperty(value = "状态",index = 7)
+ private String status;
+
+ public String getStatus() {
+ if("1".equals(this.status)){
+ return "待兑奖";
+ }
+ if("2".equals(this.status)){
+ return "已兑奖";
+ }
+ if("3".equals(this.status)){
+ return "已失效";
+ }
+ return "";
+ }
}
--
Gitblit v1.7.1