Explorar o código

feat:线下课考勤调整

Joburgess %!s(int64=4) %!d(string=hai) anos
pai
achega
e3f3d4f609

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDto.java

@@ -62,6 +62,8 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "教师正常签到提前时间(分钟)",required = false)
     private Integer advanceSignInMinutes;
 
+    private Integer advanceSignOutMinutes;
+
     @ApiModelProperty(value = "老师可打卡范围,单位米")
     private Integer attendanceRange;
 
@@ -162,6 +164,14 @@ public class TeacherAttendanceDto {
         this.teacherName = teacherName;
     }
 
+    public Integer getAdvanceSignOutMinutes() {
+        return advanceSignOutMinutes;
+    }
+
+    public void setAdvanceSignOutMinutes(Integer advanceSignOutMinutes) {
+        this.advanceSignOutMinutes = advanceSignOutMinutes;
+    }
+
     public String getCourseScheduleName() {
         return courseScheduleName;
     }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java

@@ -156,4 +156,14 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @return void
      */
     void closeSalaryConfirm(String month);
+
+    /**
+     * @describe
+     * @author Joburgess
+     * @date 2020.10.22
+     * @param courseSchedule:
+     * @param courseScheduleTeacherSalaries:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>
+     */
+    List<CourseScheduleTeacherSalary> createMusicGroupCourseTeacerSalary(CourseSchedule courseSchedule, List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
 }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -304,6 +304,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         currentCourseDetail.setCurrentTime(new Date());
         currentCourseDetail.setAdvanceSignInMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES)));
         currentCourseDetail.setAttendanceRange(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ATTENDANCE_RANGE)));
+        currentCourseDetail.setAdvanceSignOutMinutes(60);
         return currentCourseDetail;
     }
 

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

@@ -1096,4 +1096,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month);
         teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED);
     }
+
+    @Override
+    public List<CourseScheduleTeacherSalary> createMusicGroupCourseTeacerSalary(CourseSchedule courseSchedule, List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries) {
+        return null;
+    }
 }