diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java index d3e97df8..c8e98265 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java @@ -6,6 +6,8 @@ import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.jlw.enums.StartStatusEnum; import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.fetch.annotation.Fetch; +import org.beetl.sql.fetch.annotation.FetchSql; import javax.validation.constraints.NotNull; import java.util.Date; @@ -14,6 +16,7 @@ import java.util.Date; * 教师-我的课程-开课-学生签到-配置 * gen by Spring Boot2 Admin 2022-10-11 */ +@Fetch public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{ //ID @@ -29,10 +32,29 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{ private Long teacherOpenCourseId ; //班级ID集合 - @Dict(type="school_class.class_name.class_status=1") - private String schoolClassIds ; + public String getSchoolClassIdsText() { + return schoolClassIdsText; + } + + public void setSchoolClassIdsText(String schoolClassIdsText) { + this.schoolClassIdsText = schoolClassIdsText; + } + + @FetchSql( + "@if(equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" + + "select '所有班级' \n" + + "@} else { \n" + + " select group_concat(class_name) " + + "from school_class " + + "where 1 = 1 " + + "and find_in_set(class_id, #schoolClassIds#) " + + "and class_status = 1 " + + "order by class_id " + + "@}\n" ) + private String schoolClassIdsText; + // 所有班级标识 public static String ALL_SCHOOL_CLASS_IDS_SIGN = "ALL"; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java index 5cc1d02e..ab955619 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java @@ -162,8 +162,8 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic * @param id * @param status */ - public void setStatus(@NotNull(message = "签到配置ID不能为空!") Long id, - @NotNull(message = "签到状态不能为空!") + public void editStatus(@NotNull(message = "签到配置ID不能为空!") Long id, + @NotNull(message = "签到状态不能为空!") @Pattern(regexp = "[12]",message = "状态只接收两个值:1开始 2结束") Integer status) { TeacherOpenCourseStudentSigninSetting model = new TeacherOpenCourseStudentSigninSetting(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java index dc2290a7..4c174519 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java @@ -202,11 +202,11 @@ public class TeacherOpenCourseStudentSigninSettingController{ * @param status 1:开始 2:结束 * @return */ - @PostMapping(MODEL + "/setStatus.json") + @PostMapping(MODEL + "/editStatus.json") @Function("teacherOpenCourseStudentSigninSetting.edit") @ResponseBody - public JsonResult setStatus(Long id, Integer status) { - teacherOpenCourseStudentSigninSettingService.setStatus(id, status); + public JsonResult editStatus(Long id, Integer status) { + teacherOpenCourseStudentSigninSettingService.editStatus(id, status); return JsonResult.success(); }