Compare commits

..

No commits in common. "534bf9e2ae39a0e82fca37a4377dcf5fb12b1c76" and "e03acb446329633b61972d59e8f8d75f27c3cf92" have entirely different histories.

1 changed files with 9 additions and 7 deletions

View File

@ -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);
}