Forráskód Böngészése

调课顶课作废

dzx 5 hónapja
szülő
commit
72f3577238

+ 12 - 0
src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -24,8 +24,11 @@ import com.xjrsoft.module.schedule.dto.CourseTableDto;
 import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
 import com.xjrsoft.module.schedule.dto.ScheduleWeekDto;
 import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
+import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
 import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
+import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
+import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;
 import com.xjrsoft.module.schedule.vo.ClassOptionVo;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
@@ -80,6 +83,7 @@ public class ScheduleController {
     private final IBaseTeacherService baseTeacherService;
     private final ITeacherbaseManagerService teacherService;
     private final IBaseSemesterService semesterService;
+    private final IWfCourseAdjustService courseAdjustService;
 
     @GetMapping(value = "/receive-msg")
     @ApiOperation(value="接收消息")
@@ -387,4 +391,12 @@ public class ScheduleController {
         List<ClassOptionVo> result = courseTableService.getClassListByTeacherId(dto);
         return RT.ok(result);
     }
+
+    @PostMapping(value = "/cancel")
+    @ApiOperation(value="调课顶课的作废")
+    @SaCheckPermission("room:detail")
+    public RT<Boolean> cancel(@Valid WfCourseAdjustDto dto){
+
+        return RT.ok(courseAdjustService.cancel(dto));
+    }
 }

+ 24 - 0
src/main/java/com/xjrsoft/module/schedule/dto/WfCourseAdjustDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.schedule.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+* @title: 调课顶课申请
+* @Author dzx
+* @Date: 2024年10月14日
+* @Version 1.0
+*/
+@Data
+public class WfCourseAdjustDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+
+}

+ 2 - 1
src/main/java/com/xjrsoft/module/schedule/service/IWfCourseAdjustService.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.schedule.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 
 /**
@@ -12,6 +13,6 @@ import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 
 public interface IWfCourseAdjustService extends MPJBaseService<WfCourseAdjust> {
 
-
+    Boolean cancel(WfCourseAdjustDto dto);
 
 }

+ 23 - 0
src/main/java/com/xjrsoft/module/schedule/service/impl/WfCourseAdjustServiceImpl.java

@@ -1,11 +1,19 @@
 package com.xjrsoft.module.schedule.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.courseTable.service.ICourseTableService;
+import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
+import com.xjrsoft.module.schedule.entity.CourseTableBak;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.mapper.WfCourseAdjustMapper;
+import com.xjrsoft.module.schedule.service.ICourseTableBakService;
 import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
 * @Author dzx
@@ -15,4 +23,19 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class WfCourseAdjustServiceImpl extends MPJBaseServiceImpl<WfCourseAdjustMapper, WfCourseAdjust> implements IWfCourseAdjustService {
+    
+    private final ICourseTableBakService courseTableBakService;
+    private final ICourseTableService courseTableService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean cancel(WfCourseAdjustDto dto) {
+        WfCourseAdjust courseAdjust = this.getById(dto.getId());
+        
+        //查询出备份数据
+        List<CourseTableBak> bakList = courseTableBakService.list(
+                new QueryWrapper<CourseTableBak>().lambda()
+                        .eq(CourseTableBak::getWfCourseAdjustId, dto.getId())
+        );
+        return null;
+    }
 }