节假日调整bug修复

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeCalendarServiceImpl.java

@@ -44,12 +44,15 @@ public class ClassTimeCalendarServiceImpl extends MPJBaseServiceImpl<ClassTimeCa
             List<CourseTable> list = courseTableService.list(
                     new QueryWrapper<CourseTable>().lambda()
                             .eq(CourseTable::getScheduleDate, dto.getReplaceDate())
-                            .in(CourseTable::getTimeNumber, Arrays.asList(dto.getTimePeriod().split(",")))
+                            .in(dto.getCoverType() == 1, CourseTable::getTimeNumber, Arrays.asList(dto.getTimePeriod().split(",")))
             );
             if(list.isEmpty()){
                 throw new MyException("未能查询到补课日期那天的课表信息，请联系管理员");
             }
 
+            classTimeCalendar.setCreateDate(new Date());
+            boolean isSuccess = this.save(classTimeCalendar);
+
             //2、删除补班日期的课表数据，包括调课和顶课，并肩删除的数据进行备份
             List<CourseTable> deleteList = courseTableService.list(
                     new QueryWrapper<CourseTable>().lambda()
@@ -79,8 +82,6 @@ public class ClassTimeCalendarServiceImpl extends MPJBaseServiceImpl<ClassTimeCa
 
             courseTableService.saveBatch(insertList);
 
-            classTimeCalendar.setCreateDate(new Date());
-            boolean isSuccess = this.save(classTimeCalendar);
             return isSuccess;
         }catch (Exception e){
             log.error(e.getMessage(), e);

src/main/java/com/xjrsoft/module/evaluate/vo/MobileIndexPageVo.java

@@ -37,4 +37,7 @@ public class MobileIndexPageVo {
      */
     @ApiModelProperty("登录用户整个评价管理的已经评价对象的数量（0：表示该用户所有需要评价的对象都已经评价）")
     private Integer ratedCount;
+
+    @ApiModelProperty("状态(-1:未发布,0:暂停,1:进行中,2:已结束)")
+    private Integer status;
 }