From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 dde2575..981bc6a 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
@@ -32,11 +32,11 @@
@ExcelProperty(value = "报名时间", index = 0)
private Date createAt;
- @ExcelProperty(value = "人群标签", index = 3)
+ @ExcelProperty(value = "人员标签", index = 3)
private String tags;
@ExcelProperty(value = "报名状态",index = 5)
- private Integer status;
+ private String status;
@ExcelProperty(value = "取消原因", index = 6)
private String reason;
@@ -51,10 +51,9 @@
@ExcelIgnore
private Integer limit;
- public void setCondition(String condition) {
+ public void generateCondition() {
if(this.times!=null&&this.limit!=null){
- this.condition = "("+times+"/"+limit+")";
+ this.condition = "("+times+"/"+ (limit.equals(-1) ? "无限" : limit) +")";
}
-
}
}
\ No newline at end of file
--
Gitblit v1.7.1