From b994abe22f0345aadb1cddc035650f58205676ec Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Tue, 14 May 2024 15:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E7=AB=AF?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/stu/StuIndexController.java    |  7 +++-
 .../tea/TeaGradeManageController.java         | 38 -------------------
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
index f748298..62a275b 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
@@ -61,7 +61,8 @@ public class StuIndexController {
     private StuTheoryExamMapper theoryExamMapper;
     @Autowired
     private TeaAndStudentExamMapper teaAndStudentExamMapper;
-
+    @Autowired
+    private StuClassMapper stuClassMapper;
 
     @AnonymousAccess
     @ApiOperation("课程数据展示")
@@ -130,9 +131,13 @@ public class StuIndexController {
         StuUser stuUser = stuUserMapper.selectByPrimaryKey(userId);
         SysLoginLogExample sysLoginLogExample = new SysLoginLogExample();
         sysLoginLogExample.createCriteria().andUseridEqualTo(stuUser.getUserid());
+        sysLoginLogExample.setOrderByClause("ORDER BY  login_time desc");
         List<SysLoginLog> sysLoginLogs = sysLoginLogMapper.selectByExample(sysLoginLogExample);
+
         StuUserDto stuUserDto = new StuUserDto();
         BeanUtils.copyProperties(stuUser, stuUserDto);
+        StuClass stuClass = stuClassMapper.selectByPrimaryKey(stuUser.getClassId());
+        stuUserDto.setClassName(stuClass.getClassName());
         stuUserDto.setIpPlace(sysLoginLogs.get(0).getIpAddress());
         stuUserDto.setLastIP(sysLoginLogs.get(0).getLoginIp());
         return new ResultEntity<StuUserDto>(stuUserDto);
diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
index b7d32ea..4aa560b 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
@@ -321,44 +321,6 @@ public class TeaGradeManageController {
     }
 
 
-//    private List<TeaExamAndUserDto> getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId) {
-//        List<TeaExamAndUserDto> list = new ArrayList<>();
-//        List<StuUser> stuUsers = userMapper.selectTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId);
-//        //先拿到用户信息，再用userid查学生分数
-//        for (StuUser stuUser : stuUsers) {
-//            TeaExamAndUserDto teaExamAndUserDto = new TeaExamAndUserDto();
-//            String userid = stuUser.getUserid();
-//            StuStudentExamExample studentExamExample = new StuStudentExamExample();
-//            StuStudentExamExample.Criteria studentExamCriteria = studentExamExample.createCriteria();
-//            studentExamCriteria.andUseridEqualTo(userid);
-//            teaExamAndUserDto.setName(stuUser.getName());
-//            teaExamAndUserDto.setStudentId(stuUser.getStudentId());
-//            StuClass stuClass = stuClassMapper.selectByPrimaryKey(stuUser.getClassId());
-//            teaExamAndUserDto.setClassName(stuClass.getClassName());
-//            if (StringUtils.isNotBlank(examManageId)) {
-//                studentExamCriteria.andExamManageIdEqualTo(examManageId);
-//            }
-//            List<StuStudentExamWithBLOBs> stuStudentExams = studentExamMapper.selectByExampleWithBLOBs(studentExamExample);
-//            if (!stuStudentExams.isEmpty()) {
-//                StuStudentExamWithBLOBs stuStudentExam = stuStudentExams.get(0);
-//                if (stuStudentExam != null) {
-//                    if (stuStudentExam.getObjectiveScore() != null) {
-//                        teaExamAndUserDto.setObjectiveScore(stuStudentExam.getObjectiveScore());
-//                    }
-//                    if (stuStudentExam.getCaseScore() != null) {
-//                        teaExamAndUserDto.setCaseScore(stuStudentExam.getCaseScore());
-//                    }
-//                    if (stuStudentExam.getTotalScore() != null) {
-//                        teaExamAndUserDto.setTotalScore(stuStudentExam.getTotalScore());
-//                    }
-//                }
-//            }
-//            list.add(teaExamAndUserDto);
-//        }
-//        return list;
-//    }
-
-
     private List<TeaExamAndUserDto> getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId) {
         List<TeaExamAndUserDto> list = new ArrayList<>();