Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -415,6 +415,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     .collect(Collectors.toList());
             //根据教学点将当前老师的课程分组
             Map<Integer, List<CourseSchedule>> schoolCourseSchedules = currentTeacherCourseSchedules.stream()
+                    .filter(courseSchedule -> Objects.nonNull(courseSchedule.getSchoolId()))
                     .collect(Collectors.groupingBy(CourseSchedule::getSchoolId));
             Map<Integer, Map<Date,Integer>> schoolClassMinutesMap = new HashMap<>();
             for (Integer schoolId : schoolCourseSchedules.keySet()) {
@@ -453,7 +454,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             CourseSchedule courseSchedule = courseScheduleIdMap.get(courseScheduleTeacherSalary.getCourseScheduleId());
             Map<Integer, Map<Date,Integer>> schoolClassMinutesMap = teacherClassMinutesMap.get(courseScheduleTeacherSalary.getUserId());
             Map<Date,Integer> classDateMinutes = schoolClassMinutesMap.get(courseSchedule.getSchoolId());
-            Integer schoolClassMinutes = classDateMinutes.get(courseSchedule.getClassDate());
+
             //结算方式
             String settlementType = musicGroupSettlementsMap.get(courseScheduleTeacherSalary.getCourseScheduleId());
             if(StringUtils.isEmpty(settlementType)){
@@ -469,9 +470,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //当前课程的时长
             int duration = DateUtil.minutesBetween(courseSchedule.getStartClassTime(), courseSchedule.getEndClassTime());
             //如果是单技课或者合奏课并且结算方式为3.0
-            if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY.getCode())
+            if (Objects.nonNull(classDateMinutes)&&settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY.getCode())
                     &&(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.SINGLE)
                     || courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MIX))) {
+                Integer schoolClassMinutes = classDateMinutes.get(courseSchedule.getClassDate());
                 if (schoolClassMinutes >= settlementClassMinutes && duration < singleClassTime) {
                     duration = singleClassTime;
                     durationIsChange = true;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -426,14 +426,14 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		if(Objects.isNull(courseSchedule)){
 			throw new BizException("课程不存在");
 		}
-		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(teacherAttendanceInfo.getTeacherId().longValue(),teacherAttendanceInfo.getCourseScheduleId());
-
 		if(Objects.isNull(teacherAttendanceInfo.getTeacherId())){
 			if(Objects.isNull(courseSchedule.getActualTeacherId())){
 				throw new BizException("请指定教师");
 			}
 			teacherAttendanceInfo.setTeacherId(courseSchedule.getActualTeacherId());
 		}
+		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(teacherAttendanceInfo.getTeacherId().longValue(),teacherAttendanceInfo.getCourseScheduleId());
+
 
 		Date date = new Date();
 		if(Objects.isNull(teacherAttendance)){

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -45,14 +45,14 @@ public class StudentAttendanceController extends BaseController {
 
     @ApiOperation(value = "查询课程学生列表")
     @GetMapping("/findAttendanceStudentByCourseWithPage")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/findAttendanceStudentByCourseWithPage')")
+    @PreAuthorize("@pcs.hasPermissions('studentAttendance/findAttendanceStudentByCourseWithPage')")
     public Object findAttendanceStudentByCourseWithPage(CourseScheduleQueryInfo queryInfo){
         return succeed(classGroupService.findAttendanceStudentByCourseWithPage(queryInfo));
     }
 
     @ApiOperation(value = "更新学生签到记录")
     @PostMapping("/updateStudentAttendances")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateStudentAttendances')")
+    @PreAuthorize("@pcs.hasPermissions('studentAttendance/updateStudentAttendances')")
     public Object updateStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
         studentAttendanceService.updateStudentAttendances(studentAttendanceInfo);
         return succeed();

mec-web/src/main/resources/application.yml

@@ -30,12 +30,12 @@ spring:
 
   datasource:
     name: test
-#    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
-#    username: mec_dev
-#    password: mec_dev
+#    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+#    username: dayaData
+#    password: dayaDataOnline2019
+    url: jdbc:mysql://127.0.0.1:3306/mec_local?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: root
+    password: tiger
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver