From def88e745ae93aaa694e04c37a22421bfc8ae5bb Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Mon, 19 Dec 2022 21:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/web/QuestionLogSummaryController.java | 14 ++++----- .../TeacherOpenCourseChatLogController.java | 30 ++++++++----------- .../resources/sql/jlw/questionLogSummary.md | 16 +++++++--- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java index 57e57bf4..8011185b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java @@ -33,10 +33,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -67,7 +64,6 @@ public class QuestionLogSummaryController extends BaseController { @Autowired private QuestionLogSummaryService questionLogSummaryService; - @Autowired FileService fileService; /* 前端接口 */ @@ -112,7 +108,7 @@ public class QuestionLogSummaryController extends BaseController { * @return */ @PostMapping(API + "/analysis.do") - public JsonResult analysisDo(PageParam param, Long teacherOpenCourseId, ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) { + public JsonResult analysisDo(PageParam param, Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) { PageQuery objectPageQuery = ofDefault(new PageQuery<>(), param); objectPageQuery.setPara("questionSettingType", questionSettingType); objectPageQuery.setPara("teacherOpenCourseId", teacherOpenCourseId); @@ -127,7 +123,7 @@ public class QuestionLogSummaryController extends BaseController { * @return */ @PostMapping(API + "/exportAnalysis.do") - public void exportAnalysisDo(Long teacherOpenCourseId, ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) throws IOException { + public void exportAnalysisDo(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) throws IOException { PageQuery objectPageQuery = new PageQuery<>(); objectPageQuery.setPageNumber(1L); @@ -517,7 +513,7 @@ public class QuestionLogSummaryController extends BaseController { * @return */ @PostMapping(MODEL + "/analysisPageList.json") - public JsonResult analysisPageList(PageParam param, Long teacherOpenCourseId, ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) { + public JsonResult analysisPageList(PageParam param, Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) { PageQuery objectPageQuery = ofDefault(new PageQuery<>(), param); objectPageQuery.setPara("questionSettingType", questionSettingType); objectPageQuery.setPara("teacherOpenCourseId", teacherOpenCourseId); @@ -532,7 +528,7 @@ public class QuestionLogSummaryController extends BaseController { * @return */ @PostMapping(MODEL + "/exportAnalysis.json") - public void exportAnalysis(Long teacherOpenCourseId, ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) throws IOException { + public void exportAnalysis(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) throws IOException { // 不需要分页，直接查询出来所有的 PageQuery objectPageQuery = new PageQuery<>(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java index 00e92272..b7562cc8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java @@ -215,28 +215,22 @@ public class TeacherOpenCourseChatLogController extends BaseController { * * @param teacherOpenCourseChatLogId * @param studentScore - * @param result * @return */ @PostMapping(API + "/setScore.do") - public JsonResult setScore( - @NotNull(message = "互动ID不能为空！") - Long teacherOpenCourseChatLogId, - @NotNull(message = "学生分数不能为空！") - BigDecimal studentScore, BindingResult result) { - - if (result.hasErrors()) { - return JsonResult.failMessage(result); + public JsonResult setScore(@NotNull(message = "互动ID不能为空！") + Long teacherOpenCourseChatLogId, + @NotNull(message = "学生分数不能为空！") + BigDecimal studentScore) { + + TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery(); + teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogId(teacherOpenCourseChatLogId); + teacherOpenCourseChatLogQuery.setStudentScore(studentScore); + String msg = teacherOpenCourseChatLogService.edit(teacherOpenCourseChatLogQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); } else { - TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery(); - teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogId(teacherOpenCourseChatLogId); - teacherOpenCourseChatLogQuery.setStudentScore(studentScore); - String msg = teacherOpenCourseChatLogService.edit(teacherOpenCourseChatLogQuery); - if (StringUtils.isBlank(msg)) { - return JsonResult.success(); - } else { - return JsonResult.failMessage("更新失败," + msg); - } + return JsonResult.failMessage("更新失败," + msg); } } diff --git a/web/src/main/resources/sql/jlw/questionLogSummary.md b/web/src/main/resources/sql/jlw/questionLogSummary.md index 0662b067..b32005b2 100644 --- a/web/src/main/resources/sql/jlw/questionLogSummary.md +++ b/web/src/main/resources/sql/jlw/questionLogSummary.md @@ -864,10 +864,14 @@ getExcelValues ) )t -analysis +analysisPageQuery === * 题目配置，统计分析接口。用于分析所有题目类型的平均值 - + select + @pageTag(){ + z.* + @} + from ( select t.question_setting_name, t.question_log_summary_from_type, @@ -884,12 +888,16 @@ analysis from question_log_summary t left join teacher_open_course_question_setting ta on ta.teacher_open_course_question_setting_id = t.question_setting_id where 1 = 1 + @if(!isEmpty(questionSettingType)) { and t.question_setting_type = #questionSettingType# - and ta.teacher_open_course_question_setting_type = #questionSettingType# + and ta.teacher_open_course_question_setting_type = #questionSettingType# + @} and t.question_log_summary_status = 1 and ta.teacher_open_course_id = #teacherOpenCourseId# and ta.teacher_open_course_question_setting_status = 1 AND ta.teacher_open_course_question_setting_push_status = 1 group by t.question_setting_name, - question_log_summary_from_type \ No newline at end of file + question_log_summary_from_type + ) z + \ No newline at end of file