Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplatePlanController.java

@@ -130,6 +130,13 @@ public class AssessmentTemplatePlanController {
         }
         templatePlan.setStatus(dto.getStatus());
         planService.updateById(templatePlan);
+        if(dto.getStatus() == 1){
+            if(templatePlan.getIsNeedConfirm() == 1){
+                planService.sendMsgToTeacher(templatePlan);
+            }else{
+                planService.sendMsgToClass(templatePlan);
+            }
+        }
         return RT.ok(true);
     }
 

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

@@ -364,6 +364,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean adjustCourse(WfCourseAdjust courseAdjust){
         //先查询课表数据，看是否能够查询到，如果能查到
         List<CourseTable> list = this.list(
@@ -384,6 +385,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             courseCount += exchangeCourseIds.length;
             courseIdList.addAll(Arrays.asList(exchangeCourseIds));
         }
+        LocalDateTime now = LocalDateTime.now();
 
         if(list.isEmpty() || list.size() != courseCount){
             list = this.list(
@@ -498,6 +500,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
 //                            + courseTable.getSiteId() + "_"
 //                            + courseTable.getTimeNumber()
 //                    );
+                    courseTable.setModifyDate(now);
                     courseTableMapper.updateById(courseTable);
 
                     swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
@@ -513,6 +516,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                     swapCourseTable.setTeacherId(courseTableBak.getTeacherId());
                     swapCourseTable.setSiteId(courseTableBak.getSiteId());
                     swapCourseTable.setTeacherName(courseTableBak.getTeacherName());
+                    swapCourseTable.setModifyDate(now);
                     courseTableMapper.updateById(swapCourseTable);
                 }
                 //提交调课接口
@@ -529,6 +533,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                     courseTable.setAdjustType(courseAdjust.getAdjustType());
                     courseTable.setTeacherId(teacherId);
                     courseTable.setTeacherName(teacherName);
+                    courseTable.setModifyDate(now);
 //                    courseTable.setKeyInfo(teacherId + "_" + courseTable.getClassId() + "_" + courseTable.getScheduleDate() + "_" + courseTable.getCourseId() + "_" + courseTable.getSiteId() + "_" + courseTable.getTimeNumber());
                     courseTableMapper.updateById(courseTable);
                 }