From 7943667181f2cb51cbd6db864ffe1fbfa51f2a67 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 13 Jan 2023 09:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E5=92=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/QuestionLogSummaryAnalysisVO.java      | 30 +++++++++++--------
 .../resources/sql/jlw/questionLogSummary.md   |  6 +++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/QuestionLogSummaryAnalysisVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/QuestionLogSummaryAnalysisVO.java
index c77e4b0f..bbcc6c4d 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/vo/QuestionLogSummaryAnalysisVO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/QuestionLogSummaryAnalysisVO.java
@@ -25,64 +25,70 @@ public class QuestionLogSummaryAnalysisVO extends BaseEntity {
     /**
      * 题目配置名称（作业名称、章节练习名称、考试名称等）
      */
-    @ExcelProperty(value = "名称", index = 1)
+    @ExcelProperty(value = "名称")
     private String questionSettingName;
+
+    @ExcelProperty(value = "开始时间")
+    private String startTime;
+
+    @ExcelProperty(value = "结束时间")
+    private String endTime;
     /**
      * 题目总数
      */
-    @ExcelProperty(value = "题目总数", index = 2)
+    @ExcelProperty(value = "题目总数")
     private String questionTotalCount;
     /**
      * 合计场次
      */
-    @ExcelProperty(value = "合计场次", index = 3)
+    @ExcelProperty(value = "合计场次")
     private String totalSettingCount;
     /**
      * 平均答对数量
      */
-    @ExcelProperty(value = "平均答对数量", index = 4)
+    @ExcelProperty(value = "平均答对数量")
     private String avgCorrectCount;
     /**
      * 平均答错数量
      */
-    @ExcelProperty(value = "平均答错数量", index = 5)
+    @ExcelProperty(value = "平均答错数量")
     private String avgWrongCount;
     /**
      * 学生平均分数
      */
-    @ExcelProperty(value = "学生平均分数", index = 6)
+    @ExcelProperty(value = "学生平均分数")
     private String avgStudentScore;
     /**
      * 总班级数
      */
-    @ExcelProperty(value = "总班级数", index = 7)
+    @ExcelProperty(value = "总班级数")
     private String totalSchoolClassCount;
 
     /**
      * 平均做题数量
      */
-    @ExcelProperty(value = "平均做题数量", index = 8)
+    @ExcelProperty(value = "平均做题数量")
     private String avgQuestionLogSummaryStudentDoCount;
     /**
      * 平均正确率
      */
-    @ExcelProperty(value = "平均正确率", index = 9)
+    @ExcelProperty(value = "平均正确率")
     private String avgQuestionLogSummarySuccessRate;
     /**
      * 平均通过率
      */
-    @ExcelProperty(value = "平均通过率", index = 10)
+    @ExcelProperty(value = "平均通过率")
     private String avgQuestionLogSummaryIsPass;
     /**
      * 平均用时（秒）
      */
-    @ExcelProperty(value = "平均用时（秒）", index = 11)
+    @ExcelProperty(value = "平均用时（秒）")
     private String avgFinishSecondTime;
 
     /**
      * 平均用时 时间格式
      */
-    @ExcelProperty(value = "平均用时 时间格式", index = 12)
+    @ExcelProperty(value = "平均用时 时间格式")
     private String avgFinishTime;
 
     public void setAvgFinishSecondTime(String avgFinishSecondTime) {
diff --git a/web/src/main/resources/sql/jlw/questionLogSummary.md b/web/src/main/resources/sql/jlw/questionLogSummary.md
index 42a38ff9..0c3de9de 100644
--- a/web/src/main/resources/sql/jlw/questionLogSummary.md
+++ b/web/src/main/resources/sql/jlw/questionLogSummary.md
@@ -875,6 +875,8 @@ analysisPageQuery
   from (
   select  
   ta.teacher_open_course_question_setting_name as question_setting_name,
+  ta.teacher_open_course_question_start_time as start_time,
+  ta.teacher_open_course_question_end_time as end_time,
   ta.teacher_open_course_question_setting_type as question_setting_type,  
   count((ab.resources_question_snapshot_id)) as question_total_count,
   count(distinct(ta.teacher_open_course_question_setting_id)) as total_setting_count,
@@ -902,7 +904,9 @@ analysisPageQuery
   AND ta.teacher_open_course_question_setting_name is not null
   group by  
   ta.teacher_open_course_question_setting_name,
-  ta.teacher_open_course_question_setting_type
+  ta.teacher_open_course_question_setting_type,
+  ta.teacher_open_course_question_start_time,
+  ta.teacher_open_course_question_end_time
   ) z
 
 analysisAvg