|
@@ -1,5 +1,6 @@
|
|
|
package com.xjrsoft.module.schedule.service.impl;
|
|
|
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
@@ -7,6 +8,8 @@ import com.xjrsoft.common.enums.CourseAdjustTypeEnum;
|
|
|
import com.xjrsoft.common.enums.EnabledMark;
|
|
|
import com.xjrsoft.module.courseTable.entity.CourseTable;
|
|
|
import com.xjrsoft.module.courseTable.service.ICourseTableService;
|
|
|
+import com.xjrsoft.module.organization.entity.User;
|
|
|
+import com.xjrsoft.module.organization.service.IUserService;
|
|
|
import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
|
|
|
import com.xjrsoft.module.schedule.entity.CourseTableBak;
|
|
|
import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
|
|
@@ -36,6 +39,7 @@ public class WfCourseAdjustServiceImpl extends MPJBaseServiceImpl<WfCourseAdjust
|
|
|
|
|
|
private final ICourseTableBakService courseTableBakService;
|
|
|
private final ICourseTableService courseTableService;
|
|
|
+ private final IUserService userService;
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean cancel(WfCourseAdjustDto dto) {
|
|
@@ -81,6 +85,8 @@ public class WfCourseAdjustServiceImpl extends MPJBaseServiceImpl<WfCourseAdjust
|
|
|
}
|
|
|
courseAdjust.setEnabledMark(EnabledMark.DISABLED.getCode());
|
|
|
courseAdjust.setModifyDate(new Date());
|
|
|
+ User user = userService.getById(StpUtil.getLoginIdAsLong());
|
|
|
+ courseAdjust.setCancelReason("被" + user.getName() + "作废");
|
|
|
this.updateById(courseAdjust);
|
|
|
return true;
|
|
|
}
|