Merge remote-tracking branch 'SAMS/v0.2' into v0.2

# Conflicts:
#	src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java

src/main/java/com/bruce/sams/service/impl/ActivityServiceImpl.java

@@ -2,6 +2,7 @@ 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;
@@ -21,20 +22,17 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     public void createActivity(Activity activity) {
         // 初始化活动审批状态
         switch (activity.getActivityType()) {
-            case CLUB_INTERNAL:
-                activity.setStatus("pending_club");
-                break;
-            case CLUB_EXTERNAL:
-                activity.setStatus("pending_club");
+            case CLUB_INTERNAL, CLUB_EXTERNAL:
+                activity.setStatus(ActivityStatus.PENDING_CLUB);
                 break;
             case DEPARTMENT:
-                activity.setStatus("pending_department");
+                activity.setStatus(ActivityStatus.PENDING_DEPARTMENT);
                 break;
             case COLLEGE:
-                activity.setStatus("pending_college");
+                activity.setStatus(ActivityStatus.PENDING_COLLEGE);
                 break;
             default:
-                activity.setStatus("draft");
+                activity.setStatus(ActivityStatus.DRAFT);
                 break;
         }
         this.save(activity);
@@ -56,7 +54,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     @Override
     public void cancelActivity(Long actId) {
         Activity activity = this.getById(actId);
-        activity.setStatus("cancelled");
+        activity.setStatus(ActivityStatus.CANCELLED);
         this.updateById(activity);
     }