v0.2.12 登录校验修正
parent
e7950bf615
commit
77a09d2eba
|
|
@ -2,7 +2,6 @@ package com.bruce.sams.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.bruce.sams.domain.ams.Activity;
|
import com.bruce.sams.domain.ams.Activity;
|
||||||
import com.bruce.sams.domain.entity.ActivityStatus;
|
|
||||||
import com.bruce.sams.service.ActivityService;
|
import com.bruce.sams.service.ActivityService;
|
||||||
import com.bruce.sams.mapper.ActivityMapper;
|
import com.bruce.sams.mapper.ActivityMapper;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -22,17 +21,20 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
||||||
public void createActivity(Activity activity) {
|
public void createActivity(Activity activity) {
|
||||||
// 初始化活动审批状态
|
// 初始化活动审批状态
|
||||||
switch (activity.getActivityType()) {
|
switch (activity.getActivityType()) {
|
||||||
case CLUB_INTERNAL, CLUB_EXTERNAL:
|
case CLUB_INTERNAL:
|
||||||
activity.setStatus(ActivityStatus.PENDING_CLUB);
|
activity.setStatus("pending_club");
|
||||||
|
break;
|
||||||
|
case CLUB_EXTERNAL:
|
||||||
|
activity.setStatus("pending_club");
|
||||||
break;
|
break;
|
||||||
case DEPARTMENT:
|
case DEPARTMENT:
|
||||||
activity.setStatus(ActivityStatus.PENDING_DEPARTMENT);
|
activity.setStatus("pending_department");
|
||||||
break;
|
break;
|
||||||
case COLLEGE:
|
case COLLEGE:
|
||||||
activity.setStatus(ActivityStatus.PENDING_COLLEGE);
|
activity.setStatus("pending_college");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
activity.setStatus(ActivityStatus.DRAFT);
|
activity.setStatus("draft");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
this.save(activity);
|
this.save(activity);
|
||||||
|
|
@ -54,7 +56,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
||||||
@Override
|
@Override
|
||||||
public void cancelActivity(Long actId) {
|
public void cancelActivity(Long actId) {
|
||||||
Activity activity = this.getById(actId);
|
Activity activity = this.getById(actId);
|
||||||
activity.setStatus(ActivityStatus.CANCELLED);
|
activity.setStatus("cancelled");
|
||||||
this.updateById(activity);
|
this.updateById(activity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue