From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 7fb74fa..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;
@@ -44,17 +44,16 @@
     @ExcelProperty(value = "参与情况", index = 7)
     private String condition;
 
-    @ExcelProperty(value = "获得奖励", index = 7)
+    @ExcelProperty(value = "获得奖励", index = 8)
     private String award;
     @ExcelIgnore
     private Integer times;
     @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