查询开课签到记录

web/src/main/java/com/ibeetl/jlw/entity/Student.java

@@ -4,6 +4,8 @@ import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchOne;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -13,6 +15,7 @@ import java.util.Date;
 * 学生管理
 * gen by Spring Boot2 Admin 2021-06-19
 */
+@Fetch
 public class Student extends BaseEntity{
 
     //ID
@@ -70,6 +73,9 @@ public class Student extends BaseEntity{
 
     private Long userId ;
 
+    @FetchOne("classId")
+    private SchoolClass schoolClass;
+	
     public Student(){
     }
 
@@ -237,4 +243,12 @@ public class Student extends BaseEntity{
     public void setStudentWeixinInfo(String studentWeixinInfo) {
         this.studentWeixinInfo = studentWeixinInfo;
     }
+
+    public SchoolClass getSchoolClass() {
+        return schoolClass;
+    }
+
+    public void setSchoolClass(SchoolClass schoolClass) {
+        this.schoolClass = schoolClass;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLog.java

@@ -1,10 +1,13 @@
 package com.ibeetl.jlw.entity;
 
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictEnum;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchOne;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -13,6 +16,7 @@ import java.util.Date;
 * 教师-我的课程-开课-学生签到记录
 * gen by Spring Boot2 Admin 2022-10-12
 */
+@Fetch
 public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
 
     //ID
@@ -64,6 +68,7 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
 
     // 签到标签 10 签到，20 缺勤
 
+    @DictEnum("desc")
     private TeacherOpenCourseStudentSigninLogQuery.SignInTypeEnum teacherOpenCourseStudentSigninLogTag;
 	
     //组织ID
@@ -74,6 +79,11 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
 
     private Long userId ;
 
+    // 扩展属性
+    @FetchOne("studentId")
+
+    private Student student;
+	
     public TeacherOpenCourseStudentSigninLog(){
     }
 
@@ -230,4 +240,12 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
     public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
         this.teacherOpenCourseStudentSigninSettingSessionTime = teacherOpenCourseStudentSigninSettingSessionTime;
     }
+
+    public Student getStudent() {
+        return student;
+    }
+
+    public void setStudent(Student student) {
+        this.student = student;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java

@@ -65,7 +65,13 @@ public class TeacherOpenCourseMergeSchoolClassController{
         }
     }
 
-
+    /**
+     * 可以用于，开课关联班级
+     *
+     * @param param
+     * @param coreUser
+     * @return
+     */
     @GetMapping(API + "/getList.do")
     public JsonResult<List<TeacherOpenCourseMergeSchoolClass>>getList(TeacherOpenCourseMergeSchoolClassQuery param,@SCoreUser CoreUser coreUser) {
         if(null == coreUser){

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java

@@ -206,14 +206,14 @@ public class TeacherOpenCourseStudentSigninLogController{
 
     /**
      * 教师端-签到日志
+     * 页面组件之间的动态查询关系，也是通过这几个接口进行查询
+     * 步骤：
+     * 1. 通过开课ID，查询开课关联班级 {@link com.ibeetl.jlw.web.TeacherOpenCourseMergeSchoolClassController#getList}
+     * 2. 通过班级ID，查询学生列表 {@link StudentController#list}
+     * 3. 通过学生ID，查询学生的签到日志 {@link TeacherOpenCourseStudentSigninLogController#list}
+     *
      * @param query
      * @return
      */
-    @PostMapping(MODEL + "/signinLog.json")
-    @Function("teacherOpenCourseStudentSigninLog.add")
-    @ResponseBody
-    public JsonResult signinLog(TeacherOpenCourseStudentSigninLogQuery query) {
-        return JsonResult.success(teacherOpenCourseStudentSigninLogService.signinLog(query));
-    }
 
 }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java

@@ -43,16 +43,20 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
     private SignInTypeEnum teacherOpenCourseStudentSigninLogTag;
 
     public static enum SignInTypeEnum {
-        SIGN_IN(10),
-        UN_SIGN_IN(20);
+        SIGN_IN(10, "签到"),
+        UN_SIGN_IN(20, "缺勤");
 
-        SignInTypeEnum(Integer code) {
+        SignInTypeEnum(Integer code, String desc) {
             this.code = code;
+            this.desc = desc;
         }
 
         @Getter
         @EnumValue
         private Integer code;
+
+        @Getter
+        private String desc;
     }
 
     @Query(name = "组织ID", display = false)