From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java
index 3700ca7..1b383ea 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java
@@ -4,9 +4,8 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.service.*;
import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.vo.admin.dashboard.IndexVO;
+import com.ycl.jxkg.domain.vo.admin.dashboard.IndexVO;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -20,8 +19,8 @@
private final ExamPaperService examPaperService;
private final QuestionService questionService;
- private final ExamPaperAnswerService examPaperAnswerService;
- private final ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService;
+ private final ExamPaperScoreService examPaperScoreService;
+ private final ExamPaperScoreDetailService examPaperScoreDetailService;
private final UserEventLogService userEventLogService;
@RequestMapping(value = "/index", method = RequestMethod.POST)
@@ -30,8 +29,8 @@
Integer examPaperCount = examPaperService.selectAllCount();
Integer questionCount = questionService.selectAllCount();
- Integer doExamPaperCount = examPaperAnswerService.selectAllCount();
- Integer doQuestionCount = examPaperQuestionCustomerAnswerService.selectAllCount();
+ Integer doExamPaperCount = examPaperScoreService.selectAllCount();
+ Integer doQuestionCount = examPaperScoreService.selectAllQuestionCount();
vm.setExamPaperCount(examPaperCount);
vm.setQuestionCount(questionCount);
@@ -39,7 +38,7 @@
vm.setDoQuestionCount(doQuestionCount);
List<Integer> mothDayUserActionValue = userEventLogService.selectMothCount();
- List<Integer> mothDayDoExamQuestionValue = examPaperQuestionCustomerAnswerService.selectMothCount();
+ List<Integer> mothDayDoExamQuestionValue = examPaperScoreDetailService.selectMothCount();
vm.setMothDayUserActionValue(mothDayUserActionValue);
vm.setMothDayDoExamQuestionValue(mothDayDoExamQuestionValue);
--
Gitblit v1.8.0