From ac35df3287734ffc91dd639d6b3512fbe5566b73 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sun, 2 Oct 2022 20:55:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/mysql/tianze-pro-update.sql | 1 + .../TeacherOpenCourseScoreDashboard.java | 8 ++++++ ...eacherOpenCourseScoreDashboardService.java | 1 + ...herOpenCourseScoreDashboardController.java | 27 ++++++++++++++----- .../TeacherOpenCourseScoreDashboardQuery.java | 12 +++++++++ .../jlw/teacherOpenCourseScoreDashboard.md | 26 +++++++++++++++++- 6 files changed, 68 insertions(+), 7 deletions(-) diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index 1b2c853f..3237c1e5 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -139,3 +139,4 @@ create table teacher_open_course_score_weight alter table teacher_open_course_score_weight comment '教师-我的课程-成绩权重'; +ALTER TABLE teacher_open_course_score_dashboard ADD COLUMN teacher_open_course_id bigint(20) COMMENT '课程开课ID'; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java index 01ecf1aa..cc5b07ce 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java @@ -80,6 +80,8 @@ public class TeacherOpenCourseScoreDashboard extends BaseEntity{ //创建时间 private Date createTime ; + //课程开课ID + private Date teacherOpenCourseId; public TeacherOpenCourseScoreDashboard(){ } @@ -279,5 +281,11 @@ public class TeacherOpenCourseScoreDashboard extends BaseEntity{ this.createTime = createTime; } + public Date getTeacherOpenCourseId() { + return teacherOpenCourseId; + } + public void setTeacherOpenCourseId(Date teacherOpenCourseId) { + this.teacherOpenCourseId = teacherOpenCourseId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java index 4306a361..073895b3 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java @@ -379,4 +379,5 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService updateGrades(@RequestBody Map map) { + String teacherOpenCourseId = MapUtils.getString(map, "teacherOpenCourseId"); + if (StringUtils.isEmpty(teacherOpenCourseId)) { + return JsonResult.failMessage("课程开课ID不能为空"); + } + return JsonResult.success(); + } + + + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java index 2f27e5a8..e9be0aa1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java @@ -47,6 +47,9 @@ public class TeacherOpenCourseScoreDashboardQuery extends PageParam { private Long userId; @Query(name = "创建时间", display = false) private Date createTime; + @Query(name = "课程开课ID", display = false) + private Date teacherOpenCourseId; + private String teacherOpenCourseScoreDashboardIdPlural; private String studentIdPlural; @@ -148,6 +151,14 @@ public class TeacherOpenCourseScoreDashboardQuery extends PageParam { this.createTime = createTime; } + public Date getTeacherOpenCourseId() { + return teacherOpenCourseId; + } + + public void setTeacherOpenCourseId(Date teacherOpenCourseId) { + this.teacherOpenCourseId = teacherOpenCourseId; + } + public TeacherOpenCourseScoreDashboard pojo(){ TeacherOpenCourseScoreDashboard pojo = new TeacherOpenCourseScoreDashboard(); pojo.setTeacherOpenCourseScoreDashboardId(this.getTeacherOpenCourseScoreDashboardId()); @@ -165,6 +176,7 @@ public class TeacherOpenCourseScoreDashboardQuery extends PageParam { pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); pojo.setCreateTime(this.getCreateTime()); + pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); return pojo; } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md index b1e65296..498c858e 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md @@ -67,6 +67,9 @@ queryByCondition @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} queryByConditionQuery @@ -136,6 +139,9 @@ queryByConditionQuery @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} @@ -260,6 +266,13 @@ updateGivenByIds create_time = #createTime# , @} @} + @if(contain("teacherOpenCourseId",_given)){ + @if(isEmpty(teacherOpenCourseId)){ + teacher_open_course_id = null , + @}else{ + teacher_open_course_id = #teacherOpenCourseId# , + @} + @} teacher_open_course_score_dashboard_id = teacher_open_course_score_dashboard_id where find_in_set(teacher_open_course_score_dashboard_id,#teacherOpenCourseScoreDashboardIdPlural#) @@ -318,6 +331,9 @@ getTeacherOpenCourseScoreDashboardValues @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} getValuesByQuery @@ -385,7 +401,9 @@ getValuesByQuery @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} - + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} @@ -468,6 +486,9 @@ getExcelValues @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} ) UNION ALL ( @@ -543,6 +564,9 @@ getExcelValues @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} ) )t