From 3389e27613953cf3d7d06653139bf902e08736dc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 22 十月 2021 13:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
index 08528a7..7fb74fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -33,4 +34,27 @@
@ExcelProperty(value = "人群标签", index = 3)
private String tags;
+
+ @ExcelProperty(value = "报名状态",index = 5)
+ private Integer status;
+
+ @ExcelProperty(value = "取消原因", index = 6)
+ private String reason;
+
+ @ExcelProperty(value = "参与情况", index = 7)
+ private String condition;
+
+ @ExcelProperty(value = "获得奖励", index = 7)
+ private String award;
+ @ExcelIgnore
+ private Integer times;
+ @ExcelIgnore
+ private Integer limit;
+
+ public void setCondition(String condition) {
+ if(this.times!=null&&this.limit!=null){
+ this.condition = "("+times+"/"+limit+")";
+ }
+
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1