From 77a09d2eba26f269dbbfc167c2246a102b687b31 Mon Sep 17 00:00:00 2001
From: bruce <sunzhiye01@outlook.com>
Date: Mon, 24 Mar 2025 11:25:42 +0800
Subject: [PATCH] =?UTF-8?q?v0.2.12=20=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sams/service/impl/ActivityServiceImpl.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java b/src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java
index f995bfd6..8c977bec 100644
--- a/src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java
@@ -2,7 +2,6 @@ package com.bruce.sams.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bruce.sams.domain.ams.Activity;
-import com.bruce.sams.domain.entity.ActivityStatus;
 import com.bruce.sams.service.ActivityService;
 import com.bruce.sams.mapper.ActivityMapper;
 import org.springframework.stereotype.Service;
@@ -22,17 +21,20 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     public void createActivity(Activity activity) {
         // 初始化活动审批状态
         switch (activity.getActivityType()) {
-            case CLUB_INTERNAL, CLUB_EXTERNAL:
-                activity.setStatus(ActivityStatus.PENDING_CLUB);
+            case CLUB_INTERNAL:
+                activity.setStatus("pending_club");
+                break;
+            case CLUB_EXTERNAL:
+                activity.setStatus("pending_club");
                 break;
             case DEPARTMENT:
-                activity.setStatus(ActivityStatus.PENDING_DEPARTMENT);
+                activity.setStatus("pending_department");
                 break;
             case COLLEGE:
-                activity.setStatus(ActivityStatus.PENDING_COLLEGE);
+                activity.setStatus("pending_college");
                 break;
             default:
-                activity.setStatus(ActivityStatus.DRAFT);
+                activity.setStatus("draft");
                 break;
         }
         this.save(activity);
@@ -54,7 +56,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     @Override
     public void cancelActivity(Long actId) {
         Activity activity = this.getById(actId);
-        activity.setStatus(ActivityStatus.CANCELLED);
+        activity.setStatus("cancelled");
         this.updateById(activity);
     }