zouxuan 5 年 前
コミット
8ba491dc26

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.BaseEnum;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -142,6 +143,16 @@ public class CourseSchedule {
 
 	private Integer isLock;
 
+	private YesOrNoEnum isCallNames;
+
+	public YesOrNoEnum getIsCallNames() {
+		return isCallNames;
+	}
+
+	public void setIsCallNames(YesOrNoEnum isCallNames) {
+		this.isCallNames = isCallNames;
+	}
+
 	public Integer getIsLock() {
 		return isLock;
 	}

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

@@ -2785,6 +2785,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         .distinct().collect(Collectors.toList());
                 List<Map<Long, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
                 Map<Long, Long> courseSettlementMap = MapUtil.convertIntegerMap(courseSettlementMaps);
+                Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
                 dataList.forEach(courseSchedule -> {
                     Long isSettlement = courseSettlementMap.get(courseSchedule.getId().longValue());
                     if (Objects.isNull(isSettlement) || isSettlement <= 0) {
@@ -2792,6 +2793,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     } else {
                         courseSchedule.setIsSettlement(1);
                     }
+                    Long studentNum = studentNumCourseMap.get(courseSchedule.getId());
+                    if (Objects.nonNull(studentNum)) {
+                        courseSchedule.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+                    } else {
+                        courseSchedule.setIsCallNames(YesOrNoEnum.NO);
+                    }
                 });
             }
         }