feat: 练习模式添加查询

yangchuansheng · May 4, 2024 · 91cdab8 · 91cdab8
1 parent 24478ff
commit 91cdab8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/server/rdbms/src/main/java/cn/surveyking/server/impl/AnswerServiceImpl.java b/server/rdbms/src/main/java/cn/surveyking/server/impl/AnswerServiceImpl.java
@@ -376,6 +376,7 @@ public PaginationResponse<ExerciseView> historyExercise(HistoryExerciseQuery que
         super.page(page, Wrappers.<Answer>lambdaQuery()
                 .eq(query.getProjectId() != null, Answer::getProjectId, query.getProjectId())
                 .isNotNull(Answer::getExamExerciseType)
+                .eq(query.getTempSave() != null, Answer::getTempSave, query.getTempSave())
                 .eq(Answer::getCreateBy, SecurityContextUtils.getUserId())
                 .orderByDesc(Answer::getCreateAt));
 
@@ -385,7 +386,7 @@ public PaginationResponse<ExerciseView> historyExercise(HistoryExerciseQuery que
             view.setProjectName(x.getProjectId());
             view.setTempSave(x.getTempSave());
             view.setCreateAt(x.getCreateAt());
-            view.setExamPracticeType(x.getExamExerciseType());
+            view.setExamExerciseType(x.getExamExerciseType());
             view.setAnswerId(x.getId());
             SurveySchema schema = x.getSurvey();
             view.setProjectName(schema.getTitle());

diff --git a/server/shared/src/main/java/cn/surveyking/server/domain/dto/ExerciseView.java b/server/shared/src/main/java/cn/surveyking/server/domain/dto/ExerciseView.java
@@ -30,7 +30,7 @@ public class ExerciseView {
 
     private Date createAt;
 
-    private ExamExerciseTypeEnum examPracticeType;
+    private ExamExerciseTypeEnum examExerciseType;
 
     private String repoId;
 

diff --git a/server/shared/src/main/java/cn/surveyking/server/domain/dto/HistoryExerciseQuery.java b/server/shared/src/main/java/cn/surveyking/server/domain/dto/HistoryExerciseQuery.java
@@ -17,7 +17,7 @@ public class HistoryExerciseQuery extends PageQuery {
 
 	private String projectId;
 
-	private String tempSave;
+	private Integer tempSave;
 
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date[] createTime;