diff --git a/src/main/java/com/jevon/controller/ScheduleController.java b/src/main/java/com/jevon/controller/ScheduleController.java index 5721630..43f0561 100644 --- a/src/main/java/com/jevon/controller/ScheduleController.java +++ b/src/main/java/com/jevon/controller/ScheduleController.java @@ -765,73 +765,75 @@ public class ScheduleController { return true ; }else { //增加判断 不排课的课程不能替换 合班的课程不能替换 联课的可能不能替换 - JoinClass joinClass = new JoinClass(); - joinClass.setSchoolId(nextClass.getSchoolId()); - joinClass.setTeam(nextClass.getTeam()); - joinClass.setCourseId(nextClass.getCourseId()); - joinClass.setClassId(nextClass.getClassId()); - List joinClasses = joinClassService.selectByCourse(joinClass); - boolean joinClassFlag = joinClasses != null && joinClasses.size() > 0 ; - TeacherClass searchTeacherClass = new TeacherClass(); - searchTeacherClass.setSchoolId(nextClass.getSchoolId()); - searchTeacherClass.setTeam(nextClass.getTeam()); - searchTeacherClass.setCourseName(nextClass.getCourseName()); - List teacherClasses = teacherClassService.selectByCourseName(searchTeacherClass); - boolean joinTimesFlag = teacherClasses.get(0).getJoinTimes()>0?true:false; - if(nextClass.getCourseName().equals("不排课") || joinClassFlag || joinTimesFlag){ - //这些课 不能替换 - }else { - TeacherClass replaceClassTeacher = new TeacherClass(); - replaceClassTeacher.setSchoolId(classCourse.getSchoolId()); - replaceClassTeacher.setGrade(classCourse.getGrade()); - replaceClassTeacher.setClassId(classCourse.getClassId()); - replaceClassTeacher.setCourseName(nextClass.getCourseName()); - replaceClassTeacher.setTeam(team); - String nextTeacher = teacherClassService.selectByCourseAndClass(replaceClassTeacher).getTeacherName(); - - //原课的老师 下一节课是否有课 ；下一节课的老师 上一节是否有课 - TeacherCourse searchTeacher = new TeacherCourse(); - searchTeacher.setSchoolId(classCourse.getSchoolId()); - searchTeacher.setSingleOrDouble(classCourse.getSingleOrDouble()); - searchTeacher.setTeacherName(teacherClass.getTeacherName()); - searchTeacher.setWeek(weekChange); - searchTeacher.setCourseNumber(courseNumberChange); - searchTeacher.setTeam(team); - TeacherCourse teacherCourse = teacherCourseService.selectTeacherCourse(searchTeacher); - - TeacherCourse nextTeacherCourseSearch = new TeacherCourse(); - nextTeacherCourseSearch.setSchoolId(classCourse.getSchoolId()); - nextTeacherCourseSearch.setSingleOrDouble(classCourse.getSingleOrDouble()); - nextTeacherCourseSearch.setTeacherName(nextTeacher); - nextTeacherCourseSearch.setWeek(week); - nextTeacherCourseSearch.setCourseNumber(courseNumber); - nextTeacherCourseSearch.setTeam(team); - TeacherCourse nextTeacherCourse = teacherCourseService.selectTeacherCourse(nextTeacherCourseSearch); - if(StringUtils.isBlank(nextTeacherCourse.getCourseName()) && StringUtils.isBlank(teacherCourse.getCourseName())){ - //则上下替换课程 班级课程上下替换，老师课程交换 - String className =teacherClass.getCourseName(); - String nextClassName = nextClass.getCourseName(); - classCourse.setCourseName(nextClassName); - nextClass.setCourseName(className); - classCourseService.updateByPrimaryKey(classCourse); - classCourseService.updateByPrimaryKey(nextClass); - - teacherCourse.setGrade(teacherClass.getGrade()); - teacherCourse.setCourseName(className); - teacherCourse.setClassId(teacherClass.getClassId()+""); - teacherCourseService.updateTeacherCourse(teacherCourse); - - nextTeacherCourse.setGrade(nextClass.getGrade()); - nextTeacherCourse.setCourseName(nextClassName); - nextTeacherCourse.setClassId(nextClass.getClassId()+""); - teacherCourseService.updateTeacherCourse(nextTeacherCourse); - - nextTeacherCourse.setWeek(weekChange); - nextTeacherCourse.setCourseNumber(courseNumberChange); - nextTeacherCourse.setCourseName(null); - nextTeacherCourse.setClassId(null); - teacherCourseService.updateTeacherCourse(nextTeacherCourse); - return true ; + if(!nextClass.getCourseName().equals("不排课")){ + JoinClass joinClass = new JoinClass(); + joinClass.setSchoolId(nextClass.getSchoolId()); + joinClass.setTeam(nextClass.getTeam()); + joinClass.setCourseId(nextClass.getCourseId()); + joinClass.setClassId(nextClass.getClassId()); + List joinClasses = joinClassService.selectByCourse(joinClass); + boolean joinClassFlag = joinClasses != null && joinClasses.size() > 0 ; + TeacherClass searchTeacherClass = new TeacherClass(); + searchTeacherClass.setSchoolId(nextClass.getSchoolId()); + searchTeacherClass.setTeam(nextClass.getTeam()); + searchTeacherClass.setCourseName(nextClass.getCourseName()); + List teacherClasses = teacherClassService.selectByCourseName(searchTeacherClass); + boolean joinTimesFlag = teacherClasses.get(0).getJoinTimes()>0?true:false; + if(nextClass.getCourseName().equals("不排课") || joinClassFlag || joinTimesFlag){ + //这些课 不能替换 + }else { + TeacherClass replaceClassTeacher = new TeacherClass(); + replaceClassTeacher.setSchoolId(classCourse.getSchoolId()); + replaceClassTeacher.setGrade(classCourse.getGrade()); + replaceClassTeacher.setClassId(classCourse.getClassId()); + replaceClassTeacher.setCourseName(nextClass.getCourseName()); + replaceClassTeacher.setTeam(team); + String nextTeacher = teacherClassService.selectByCourseAndClass(replaceClassTeacher).getTeacherName(); + + //原课的老师 下一节课是否有课 ；下一节课的老师 上一节是否有课 + TeacherCourse searchTeacher = new TeacherCourse(); + searchTeacher.setSchoolId(classCourse.getSchoolId()); + searchTeacher.setSingleOrDouble(classCourse.getSingleOrDouble()); + searchTeacher.setTeacherName(teacherClass.getTeacherName()); + searchTeacher.setWeek(weekChange); + searchTeacher.setCourseNumber(courseNumberChange); + searchTeacher.setTeam(team); + TeacherCourse teacherCourse = teacherCourseService.selectTeacherCourse(searchTeacher); + + TeacherCourse nextTeacherCourseSearch = new TeacherCourse(); + nextTeacherCourseSearch.setSchoolId(classCourse.getSchoolId()); + nextTeacherCourseSearch.setSingleOrDouble(classCourse.getSingleOrDouble()); + nextTeacherCourseSearch.setTeacherName(nextTeacher); + nextTeacherCourseSearch.setWeek(week); + nextTeacherCourseSearch.setCourseNumber(courseNumber); + nextTeacherCourseSearch.setTeam(team); + TeacherCourse nextTeacherCourse = teacherCourseService.selectTeacherCourse(nextTeacherCourseSearch); + if(StringUtils.isBlank(nextTeacherCourse.getCourseName()) && StringUtils.isBlank(teacherCourse.getCourseName())){ + //则上下替换课程 班级课程上下替换，老师课程交换 + String className =teacherClass.getCourseName(); + String nextClassName = nextClass.getCourseName(); + classCourse.setCourseName(nextClassName); + nextClass.setCourseName(className); + classCourseService.updateByPrimaryKey(classCourse); + classCourseService.updateByPrimaryKey(nextClass); + + teacherCourse.setGrade(teacherClass.getGrade()); + teacherCourse.setCourseName(className); + teacherCourse.setClassId(teacherClass.getClassId()+""); + teacherCourseService.updateTeacherCourse(teacherCourse); + + nextTeacherCourse.setGrade(nextClass.getGrade()); + nextTeacherCourse.setCourseName(nextClassName); + nextTeacherCourse.setClassId(nextClass.getClassId()+""); + teacherCourseService.updateTeacherCourse(nextTeacherCourse); + + nextTeacherCourse.setWeek(weekChange); + nextTeacherCourse.setCourseNumber(courseNumberChange); + nextTeacherCourse.setCourseName(null); + nextTeacherCourse.setClassId(null); + teacherCourseService.updateTeacherCourse(nextTeacherCourse); + return true ; + } } } } diff --git a/src/main/java/com/jevon/controller/ScheduleInitController.java b/src/main/java/com/jevon/controller/ScheduleInitController.java index e5206c1..fa3eaf0 100644 --- a/src/main/java/com/jevon/controller/ScheduleInitController.java +++ b/src/main/java/com/jevon/controller/ScheduleInitController.java @@ -210,8 +210,8 @@ public class ScheduleInitController { // 获得工作簿 Workbook workbook = null; String file = excelFile.getName(); - InputStream inputStream = new FileInputStream(excelFile) ; - //InputStream inputStream = HttpClientUtils.GetFileInputStream(initTeacherCourseReqVo.getUrl()); + //InputStream inputStream = new FileInputStream(excelFile) ; + InputStream inputStream = HttpClientUtils.GetFileInputStream(initTeacherCourseReqVo.getUrl()); if(inputStream == null){ baseVo.setMessage("路径不存在"); baseVo.setSuccess(false); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bec20be..108d6dc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,12 +3,12 @@ server: spring: datasource: - username: SZJXTUSER - password: xst200919 - url: jdbc:sqlserver://60.190.202.57:14333;database=SmartPaike -# username: szjxtuser -# password: RQminVCJota3H1u8bBYH -# url: jdbc:sqlserver://116.62.241.27:33419;database=SmartCampus_java +# username: SZJXTUSER +# password: xst200919 +# url: jdbc:sqlserver://60.190.202.57:14333;database=SmartPaike + username: szjxtuser + password: RQminVCJota3H1u8bBYH + url: jdbc:sqlserver://116.62.241.27:33419;database=SmartCampus_java driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver filters: stat maxActive: 20 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index a107865..4f93479 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,11 +1,11 @@     -     +         - +         -- libgit2 0.21.0