diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskPpt.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskPpt.java index ff20c36a..8c75b663 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskPpt.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskPpt.java @@ -32,7 +32,7 @@ public class StudentHandsOnTaskPpt extends BaseEntity{ private Long teacherOpenCourseId ; //课程实操ID - + @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1") private Long handsOnId ; //课程实操任务ID @@ -71,9 +71,29 @@ public class StudentHandsOnTaskPpt extends BaseEntity{ private Long teacherId ; //学生ID - @Dict(type="student.student_name.student_status=1") private Long studentId ; - + + private String studentName; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + //学号 + private Long studentSn; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + public StudentHandsOnTaskPpt(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java index a92907c8..606c9c48 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java @@ -34,7 +34,7 @@ public class StudentHandsOnTaskReport extends BaseEntity{ private Long handsOnId ; //课程实操任务ID - + @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1") private Long handsOnTaskId ; //文件地址PDF @@ -62,9 +62,30 @@ public class StudentHandsOnTaskReport extends BaseEntity{ private Long userId ; private Long teacherId; - @Dict(type="student.student_name.student_status=1") private Long studentId; + + private String studentName; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + //学号 + private Long studentSn; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + public StudentHandsOnTaskReport(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskStep.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskStep.java index e166ee77..96301136 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskStep.java @@ -32,7 +32,7 @@ public class StudentHandsOnTaskStep extends BaseEntity{ private Long teacherOpenCourseId ; //课程实操ID - + @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1") private Long handsOnId ; //课程实操任务ID @@ -73,9 +73,30 @@ public class StudentHandsOnTaskStep extends BaseEntity{ private Long teacherId ; //学生ID - @Dict(type="student.student_name.student_status=1") private Long studentId ; - + + private String studentName; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + //学号 + private Long studentSn; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public StudentHandsOnTaskStep(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskTheory.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskTheory.java index 50cffa12..a16c45c6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskTheory.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskTheory.java @@ -30,7 +30,7 @@ public class StudentHandsOnTaskTheory extends BaseEntity{ private Long teacherOpenCourseId ; //课程实操ID - + @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1") private Long handsOnId ; //课程实操任务ID @@ -78,9 +78,30 @@ public class StudentHandsOnTaskTheory extends BaseEntity{ private Long teacherId ; //学生ID - @Dict(type="student.student_name.student_status=1") private Long studentId ; - + + private String studentName; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + //学号 + private Long studentSn; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public StudentHandsOnTaskTheory(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskVideo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskVideo.java index 7e5c49e0..4df5cfa6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskVideo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskVideo.java @@ -32,7 +32,7 @@ public class StudentHandsOnTaskVideo extends BaseEntity{ private Long teacherOpenCourseId ; //课程实操ID - + @Dict(type="teacher_open_course_hands_on.hands_on_name.1=1") private Long handsOnId ; //课程实操任务ID @@ -71,9 +71,30 @@ public class StudentHandsOnTaskVideo extends BaseEntity{ private Long teacherId ; //学生ID - @Dict(type="student.student_name.student_status=1") private Long studentId ; - + + private String studentName; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + //学号 + private Long studentSn; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public StudentHandsOnTaskVideo(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java index 0b337046..39575930 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -102,7 +102,11 @@ public class StatisticalAnalysisService { //签到数量 data.put("signInNum", collect.size()); //到课率 - data.put("signInRate", NumberUtil.div(NumberUtil.toBigDecimal(collect.size()), NumberUtil.toBigDecimal(signinLogs.size()), 2).multiply(BigDecimal.valueOf(100)).intValue()); + if(CollectionUtil.isNotEmpty(collect)) { + data.put("signInRate", NumberUtil.div(NumberUtil.toBigDecimal(collect.size()), NumberUtil.toBigDecimal(signinLogs.size()), 2).multiply(BigDecimal.valueOf(100)).intValue()); + }else { + data.put("signInRate", 0); + } //章节练习 //总章节数 diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java index 3b748a95..584731bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java @@ -63,7 +63,14 @@ public class StudentHandsOnTaskVideoService extends CoreBaseServicequeryByConditionQuery(PageQuery query){ PageQuery ret = studentHandsOnTaskVideoDao.queryByConditionQuery(query); - queryListAfter(ret.getList()); + List list = ret.getList(); + for (StudentHandsOnTaskVideo studentHandsOnTaskVideo : list) { + String videoFile = studentHandsOnTaskVideo.getVideoFile(); + if (StringUtils.isNotEmpty(videoFile)) { + studentHandsOnTaskVideo.setVideoFiles(JSONArray.parseObject(videoFile, new TypeReference>>(){})); + } + } + queryListAfter(list); return ret; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java index a7d16a15..2cd0b379 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java @@ -40,6 +40,25 @@ public class StudentHandsOnTaskPptQuery extends PageParam { @Query(name = "学生ID", display = false) private Long studentId; + private Long studentSn; + private String studentName; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + private String studentHandsOnTaskPptIdPlural; private String teacherOpenCourseIdPlural; private String handsOnIdPlural; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java index b8a9b728..79e533f7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java @@ -39,6 +39,25 @@ public class StudentHandsOnTaskReportQuery extends PageParam { private Long userId; private Long teacherId; + private Long studentSn; + private String studentName; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + private Long studentId; private String studentHandsOnTaskReportIdPlural; private String teacherOpenCourseIdPlural; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskStepQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskStepQuery.java index 8efa201b..f5631c1b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskStepQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskStepQuery.java @@ -40,6 +40,25 @@ public class StudentHandsOnTaskStepQuery extends PageParam { @Query(name = "学生ID", display = false) private Long studentId; + private Long studentSn; + private String studentName; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + private String studentHandsOnTaskStepIdPlural; private String teacherOpenCourseIdPlural; private String handsOnIdPlural; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskTheoryQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskTheoryQuery.java index 49853a55..a7868bde 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskTheoryQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskTheoryQuery.java @@ -48,6 +48,25 @@ public class StudentHandsOnTaskTheoryQuery extends PageParam { @Query(name = "学生ID", display = false) private Long studentId; + private Long studentSn; + private String studentName; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + private String studentHandsOnTaskTheoryIdPlural; private String teacherOpenCourseIdPlural; private String handsOnIdPlural; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskVideoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskVideoQuery.java index 97a82243..cfce11c7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskVideoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskVideoQuery.java @@ -47,6 +47,25 @@ public class StudentHandsOnTaskVideoQuery extends PageParam { @Query(name = "学生ID", display = false) private Long studentId; + private Long studentSn; + private String studentName; + + public Long getStudentSn() { + return studentSn; + } + + public void setStudentSn(Long studentSn) { + this.studentSn = studentSn; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + private String studentHandsOnTaskVideoIdPlural; private String teacherOpenCourseIdPlural; private String handsOnIdPlural; diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskPpt.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskPpt.md index 91a925f5..52f1e6d6 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskPpt.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskPpt.md @@ -1,14 +1,18 @@ queryByCondition -=== +================ + * 根据不为空的参数进行分页查询 select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} from student_hands_on_task_ppt t - where 1=1 - @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + left join student t2 on t.student_id = t2.student_id + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 and #function("studentHandsOnTaskPpt.query")# @if(!isEmpty(studentHandsOnTaskPptId)){ and t.student_hands_on_task_ppt_id =#studentHandsOnTaskPptId# @@ -67,18 +71,28 @@ queryByCondition @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} queryByConditionQuery -=== +===================== + * 根据不为空的参数进行分页查询(无权限) select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} from student_hands_on_task_ppt t - where 1=1 + left join student t2 on t.student_id = t2.student_id + where 1=1 @if(!isEmpty(studentHandsOnTaskPptId)){ and t.student_hands_on_task_ppt_id =#studentHandsOnTaskPptId# @} @@ -136,27 +150,27 @@ queryByConditionQuery @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} - - - + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} deleteStudentHandsOnTaskPptByIds -=== +================================ * 批量删除 delete from student_hands_on_task_ppt where find_in_set(student_hands_on_task_ppt_id,#ids#) - - getByIds -=== +======== select * from student_hands_on_task_ppt where find_in_set(student_hands_on_task_ppt_id,#ids#) - updateGivenByIds -=== +================ * 批量更新指定字段，无论此字段是否有值 @@ -235,16 +249,14 @@ updateGivenByIds student_hands_on_task_ppt_id = student_hands_on_task_ppt_id where find_in_set(student_hands_on_task_ppt_id,#studentHandsOnTaskPptIdPlural#) - - getStudentHandsOnTaskPptValues -=== +============================== * 根据不为空的参数进行查询 select t.* from student_hands_on_task_ppt t - where 1=1 + where 1=1 @if(!isEmpty(studentHandsOnTaskPptId)){ and t.student_hands_on_task_ppt_id =#studentHandsOnTaskPptId# @} @@ -279,9 +291,8 @@ getStudentHandsOnTaskPptValues and t.student_id =#studentId# @} - getValuesByQuery -=== +================ * 根据不为空的参数进行查询 @@ -346,9 +357,8 @@ getValuesByQuery and find_in_set(t.student_id,#studentIdPlural#) @} - getValuesByQueryNotWithPermission -=== +================================= * 根据不为空的参数进行查询（不包含权限） @@ -413,11 +423,8 @@ getValuesByQueryNotWithPermission and find_in_set(t.student_id,#studentIdPlural#) @} - - - getExcelValues -=== +============== * 根据不为空的参数进行查询导入需要的参数 @@ -504,7 +511,7 @@ getExcelValues t.teacher_id , t.student_id from student_hands_on_task_ppt t - where 1=1 and #function("studentHandsOnTaskPpt.query")# + where 1=1 and #function("studentHandsOnTaskPpt.query")# @if(!isEmpty(studentHandsOnTaskPptId)){ and t.student_hands_on_task_ppt_id =#studentHandsOnTaskPptId# @} @@ -564,4 +571,3 @@ getExcelValues @} ) )t - diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md index 735b5bc3..4c34e367 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md @@ -4,9 +4,12 @@ queryByCondition select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_report t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 and #function("studentHandsOnTaskReport.query")# @@ -58,6 +61,12 @@ queryByCondition @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} queryByConditionQuery @@ -66,9 +75,12 @@ queryByConditionQuery select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_report t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @if(!isEmpty(studentHandsOnTaskReportId)){ and t.student_hands_on_task_report_id =#studentHandsOnTaskReportId# @@ -118,6 +130,12 @@ queryByConditionQuery @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskStep.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskStep.md index e9374986..15278c77 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskStep.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskStep.md @@ -4,9 +4,12 @@ queryByCondition select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_step t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 and #function("studentHandsOnTaskStep.query")# @@ -67,6 +70,12 @@ queryByCondition @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} queryByConditionQuery @@ -75,9 +84,12 @@ queryByConditionQuery select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_step t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @if(!isEmpty(studentHandsOnTaskStepId)){ and t.student_hands_on_task_step_id =#studentHandsOnTaskStepId# @@ -136,6 +148,12 @@ queryByConditionQuery @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskTheory.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskTheory.md index 2c73abcf..9b3a0f6a 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskTheory.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskTheory.md @@ -4,9 +4,12 @@ queryByCondition select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_theory t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 and #function("studentHandsOnTaskTheory.query")# @@ -79,6 +82,12 @@ queryByCondition @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} queryByConditionQuery @@ -87,9 +96,12 @@ queryByConditionQuery select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_theory t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @if(!isEmpty(studentHandsOnTaskTheoryId)){ and t.student_hands_on_task_theory_id =#studentHandsOnTaskTheoryId# @@ -160,6 +172,12 @@ queryByConditionQuery @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskVideo.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskVideo.md index 970fe633..4c00bf81 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskVideo.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskVideo.md @@ -4,9 +4,12 @@ queryByCondition select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_video t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 and #function("studentHandsOnTaskVideo.query")# @@ -67,6 +70,12 @@ queryByCondition @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @} queryByConditionQuery @@ -75,9 +84,12 @@ queryByConditionQuery select @pageTag(){ - t.* + t.*, + t2.student_sn studentSn, + t2.student_name studentName @} - from student_hands_on_task_video t + from student_hands_on_task_ppt t + left join student t2 on t.student_id = t2.student_id where 1=1 @if(!isEmpty(studentHandsOnTaskVideoId)){ and t.student_hands_on_task_video_id =#studentHandsOnTaskVideoId# @@ -136,6 +148,12 @@ queryByConditionQuery @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(studentSn)){ + and t2.student_sn =#studentSn# + @} + @if(!isEmpty(studentName)){ + and t2.student_name =#studentName# + @}