Quellcode durchsuchen

解决作废之后,调课顶课标识还在的问题

dzx vor 1 Jahr
Ursprung
Commit
f67115ff13

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

@@ -57,43 +57,43 @@ public class WfCourseAdjustServiceImpl extends MPJBaseServiceImpl<WfCourseAdjust
             bakMap.put(courseTableBak.getId(), courseTableBak);
         }
         List<Long> courseIds = bakList.stream().map(CourseTableBak::getId).collect(Collectors.toList());
-        if(courseIds.isEmpty()){
-            return true;
-        }
-        List<CourseTable> list = courseTableService.listByIds(courseIds);
-        if(CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())){//顶课
-            for (CourseTable courseTable : list) {
-                CourseTableBak tableBak = bakMap.get(courseTable.getId());
-                if(tableBak == null){
-                    continue;
+        if(!courseIds.isEmpty()){
+            List<CourseTable> list = courseTableService.listByIds(courseIds);
+            if(CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())){//顶课
+                for (CourseTable courseTable : list) {
+                    CourseTableBak tableBak = bakMap.get(courseTable.getId());
+                    if(tableBak == null){
+                        continue;
+                    }
+                    UpdateWrapper<CourseTable> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id", courseTable.getId());
+                    updateWrapper.setSql("adjust_type = null");
+                    updateWrapper.setSql("teacher_id = '" + tableBak.getTeacherId() + "'");
+                    updateWrapper.setSql("teacher_name = '" + tableBak.getTeacherName() + "'");
+                    courseTableService.update(courseTable, updateWrapper);
                 }
-                UpdateWrapper<CourseTable> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.eq("id", courseTable.getId());
-                updateWrapper.setSql("adjust_type = null");
-                updateWrapper.setSql("teacher_id = '" + tableBak.getTeacherId() + "'");
-                updateWrapper.setSql("teacher_name = '" + tableBak.getTeacherName() + "'");
-                courseTableService.update(courseTable, updateWrapper);
-            }
-        }else if(CourseAdjustTypeEnum.courseExchange.getCode().equals(courseAdjust.getAdjustType())){
-            for (CourseTable courseTable : list) {
-                CourseTableBak tableBak = bakMap.get(courseTable.getId());
-                if(tableBak == null){
-                    continue;
+            }else if(CourseAdjustTypeEnum.courseExchange.getCode().equals(courseAdjust.getAdjustType())){
+                for (CourseTable courseTable : list) {
+                    CourseTableBak tableBak = bakMap.get(courseTable.getId());
+                    if(tableBak == null){
+                        continue;
+                    }
+                    UpdateWrapper<CourseTable> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id", courseTable.getId());
+                    updateWrapper.setSql("adjust_type = null");
+                    updateWrapper.setSql("teacher_id = '" + tableBak.getTeacherId() + "'");
+                    updateWrapper.setSql("teacher_name = '" + tableBak.getTeacherName() + "'");
+                    updateWrapper.setSql("schedule_date = '" + tableBak.getScheduleDate() + "'");
+                    updateWrapper.setSql("time_period = " + tableBak.getTimePeriod());
+                    updateWrapper.setSql("time_number = " + tableBak.getTimeNumber());
+                    updateWrapper.setSql("week = '" + tableBak.getWeek() + "'");
+                    updateWrapper.setSql("weeks = '" + tableBak.getWeeks() + "'");
+                    updateWrapper.setSql("weeks_cn = '" + tableBak.getWeeksCn() + "'");
+                    courseTableService.update(courseTable, updateWrapper);
                 }
-                UpdateWrapper<CourseTable> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.eq("id", courseTable.getId());
-                updateWrapper.setSql("adjust_type = null");
-                updateWrapper.setSql("teacher_id = '" + tableBak.getTeacherId() + "'");
-                updateWrapper.setSql("teacher_name = '" + tableBak.getTeacherName() + "'");
-                updateWrapper.setSql("schedule_date = '" + tableBak.getScheduleDate() + "'");
-                updateWrapper.setSql("time_period = " + tableBak.getTimePeriod());
-                updateWrapper.setSql("time_number = " + tableBak.getTimeNumber());
-                updateWrapper.setSql("week = '" + tableBak.getWeek() + "'");
-                updateWrapper.setSql("weeks = '" + tableBak.getWeeks() + "'");
-                updateWrapper.setSql("weeks_cn = '" + tableBak.getWeeksCn() + "'");
-                courseTableService.update(courseTable, updateWrapper);
             }
         }
+
         courseAdjust.setEnabledMark(EnabledMark.DISABLED.getCode());
         courseAdjust.setModifyDate(new Date());
         User user = userService.getById(StpUtil.getLoginIdAsLong());