调课顶课调整

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -518,6 +518,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             } else if (CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())) {
                 for (String courseId : courseIds) {
                     CourseTable courseTable = courseTableMapper.selectById(courseId);
+                    if(courseTable == null){
+                        continue;
+                    }
 
                     User applyUser = userService.getById(courseAdjust.getUserId());//申请人
                     User exchangeUser = userService.getById(courseAdjust.getExchangeTeacherId());//顶课人

src/main/java/com/xjrsoft/module/job/WfCourseAdjustTask.java

@@ -10,6 +10,7 @@ import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
 import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.log.Log;
 import org.camunda.bpm.engine.history.HistoricProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -58,7 +59,11 @@ public class WfCourseAdjustTask {
                 continue;
             }
 
-            courseTableService.adjustCourse(wfCourseAdjust);
+            try {
+                courseTableService.adjustCourse(wfCourseAdjust);
+            }catch (Exception e){
+                Log.error(e.getMessage());
+            }
         }
     }
 }

src/test/java/com/xjrsoft/module/job/WfCourseAdjustTaskTest.java

@@ -18,6 +18,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -38,6 +39,9 @@ class WfCourseAdjustTaskTest {
 
     @Test
     public void execute() {
+        List<Long> ids = new ArrayList<>();
+        ids.add(1910895102200975360L);
+        ids.add(1910894870629257216L);
         List<WfCourseAdjust> list = wfCourseAdjustService.list(
                 new MPJLambdaWrapper<WfCourseAdjust>()
                         .select(WfCourseAdjust::getId)
@@ -46,6 +50,7 @@ class WfCourseAdjustTaskTest {
                         .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                         .eq(WfCourseAdjust::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(WfCourseAdjust::getEnabledMark, EnabledMark.ENABLED.getCode())
+                        .in(!ids.isEmpty(), WfCourseAdjust::getId, ids)
         );
 
         for (WfCourseAdjust wfCourseAdjust : list) {