|
|
@@ -115,30 +115,30 @@ public class CourseTableServiceImpl implements ICourseTableService {
|
|
|
//被调课是否在本周
|
|
|
if(DateUtils.isClass(fist,five,DateUtils.dateTime(courseChange.getBeSubjectTime()),format)) {
|
|
|
if(StringUtils.equals(courseChange.getWeek(),table.getWeek())){
|
|
|
- classNum.add(Long.valueOf(courseChange.getWeek()));
|
|
|
+ classNum.add(Long.valueOf(courseChange.getBeIsNum()));
|
|
|
//第几节课
|
|
|
- if(StringUtils.equals("1",courseChange.getWeek())){
|
|
|
+ if(StringUtils.equals("1",courseChange.getBeIsNum())){
|
|
|
table.setOneClass(courseChange.getSubject());
|
|
|
table.setOneTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("2",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("2",courseChange.getBeIsNum())){
|
|
|
table.setTwoClass(courseChange.getSubject());
|
|
|
table.setTwoTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("3",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("3",courseChange.getBeIsNum())){
|
|
|
table.setThreeClass(courseChange.getSubject());
|
|
|
table.setThreeTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("4",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("4",courseChange.getBeIsNum())){
|
|
|
table.setFourClass(courseChange.getSubject());
|
|
|
table.setFourTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("5",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("5",courseChange.getBeIsNum())){
|
|
|
table.setFiveClass(courseChange.getSubject());
|
|
|
table.setFiveTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("6",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("6",courseChange.getBeIsNum())){
|
|
|
table.setSixClass(courseChange.getSubject());
|
|
|
table.setSixTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("7",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("7",courseChange.getBeIsNum())){
|
|
|
table.setSevenClass(courseChange.getSubject());
|
|
|
table.setSevenTeacher(courseChange.getApplyName());
|
|
|
- }else if(StringUtils.equals("8",courseChange.getWeek())){
|
|
|
+ }else if(StringUtils.equals("8",courseChange.getBeIsNum())){
|
|
|
table.setEightClass(courseChange.getSubject());
|
|
|
table.setEightTeacher(courseChange.getApplyName());
|
|
|
}
|
