系统收费作业提交逻辑修改

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

@@ -90,6 +90,9 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "学生数量")
     private Integer studentNum;
 
+    @ApiModelProperty(value = "课程学生数量")
+    private Integer courseStudentNum;
+
     @ApiModelProperty(value = "是否是第一次进行学生点名")
     private int studentAttendanceIsFirstTime;
 
@@ -109,6 +112,14 @@ public class TeacherAttendanceDto {
 
     private Integer enableStudentAttendanceTimeRangeVip;
 
+    public Integer getCourseStudentNum() {
+        return courseStudentNum;
+    }
+
+    public void setCourseStudentNum(Integer courseStudentNum) {
+        this.courseStudentNum = courseStudentNum;
+    }
+
     public int getMemberNum() {
         return memberNum;
     }

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

@@ -224,6 +224,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         currentCourseDetail.setAdvanceSignInMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES)));
 		currentCourseDetail.setAttendanceRange(CourseScheduleType.VIP.equals(currentCourseDetail.getCourseType())?Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ATTENDANCE_RANGE_VIP)):Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ATTENDANCE_RANGE)));
         currentCourseDetail.setAdvanceSignOutMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_OUT_MINUTES)));
+		currentCourseDetail.setCourseStudentNum(courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseID));
 		//获取有会员的学员数
 		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
 		if(StringUtils.isEmpty(configValue)){

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

@@ -910,6 +910,7 @@ public class StudentServeServiceImpl implements StudentServeService {
             result.put("isAssignHomework", 0);
             return result;
         }
+
         String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
         if(StringUtils.isEmpty(configValue)){
             configValue = "0";
@@ -928,6 +929,8 @@ public class StudentServeServiceImpl implements StudentServeService {
         LocalDate localDate=LocalDate.now();
 
         if(Objects.nonNull(courseScheduleId)){
+            List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
+            result.put("courseStudentNum", students.size());
             CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
             if(Objects.isNull(courseSchedule)){
                 result.put("isAssignHomework", 0);
@@ -941,7 +944,6 @@ public class StudentServeServiceImpl implements StudentServeService {
                 if(musicGroup != null){
                     result.put("courseViewType", musicGroup.getCourseViewType());
                 }else if(result.get("memberNum") == null){
-                    List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
                     Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
                     result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
                 }