From 2533f3ef450722cf43f7fece37f2d19100e0454a Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 10:53:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java | 4 ++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 5 ++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
index cad3144..7aa275e 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
@@ -20,4 +20,8 @@
private Integer answerIntegral;
@ApiModelProperty(value = "超级记忆游戏题目数量")
private Integer answerCount;
+ @ApiModelProperty(value = "超级听力 通关率逗号隔开 第一个对应入门第二个对应中级...")
+ private String rate;
+ @ApiModelProperty(value = "超级记忆通关率")
+ private String answerRate;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 490c673..442f5b8 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -219,6 +219,8 @@
studyId.setAnswerTime(game.getAnswerTime());
studyId.setAnswerIntegral(game.getAnswerIntegral());
studyId.setAnswerCount(game.getAnswerCount());
+ studyId.setRate(game.getRate());
+ studyId.setAnswerRate(game.getAnswerRate());
gameService.updateById(studyId);
} else {
TGame tGame = new TGame();
@@ -602,7 +604,6 @@
studyPairVO.setIsVip(tStudyPair.getIsVip());
pairVOS.add(studyPairVO);
}
-
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -614,6 +615,8 @@
gameVO.setAnswerTime(tGame.getAnswerTime());
gameVO.setAnswerIntegral(tGame.getAnswerIntegral());
gameVO.setAnswerCount(tGame.getAnswerCount());
+ gameVO.setRate(tGame.getRate());
+ gameVO.setAnswerRate(tGame.getAnswerRate());
gameVOS.add(gameVO);
}
List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
--
Gitblit v1.7.1