From 66648a406e20bd75440807b9ec61c99559599c7b Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Mon, 13 May 2024 14:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8Cmapper=20xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/tea/TeaGradeManageController.java     | 10 ++++------
 .../controller/tea/UserController.java               |  8 ++++----
 .../financial_bigdata/mapper/StuUserMapper.java      |  4 ++--
 .../service/tea/ITeaGradeManageService.java          |  4 ++--
 .../service/tea/impl/TeaGradeManageServiceImpl.java  | 12 ++++++------
 .../service/tea/impl/TeaUserServiceImpl.java         |  2 +-
 src/main/resources/mapper/StuUserMapper.xml          |  4 +++-
 7 files changed, 22 insertions(+), 22 deletions(-)

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 334966d..66f1417 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
@@ -381,9 +381,8 @@ public class TeaGradeManageController {
                                                                       @RequestParam Integer size,
                                                                       @RequestParam String schoolId,
                                                                       @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
-                                                                      @RequestParam(required = false) String classId,
-                                                                      @RequestParam String userId) {
-        return new ResultEntity<PageInfo<TeaTrainingInfoDTO>>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId, userId));
+                                                                      @RequestParam(required = false) String classId) {
+        return new ResultEntity<PageInfo<TeaTrainingInfoDTO>>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId));
     }
 
     @AnonymousAccess
@@ -392,9 +391,8 @@ public class TeaGradeManageController {
     public void exportTrainingInfo(HttpServletResponse response,
                                    @RequestParam String schoolId,
                                    @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
-                                   @RequestParam(required = false) String classId,
-                                   @RequestParam String userId) {
-        iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId, userId);
+                                   @RequestParam(required = false) String classId) {
+        iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId);
     }
 
     @AnonymousAccess
diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
index 652c34f..2034ca6 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
@@ -374,7 +374,7 @@ public class UserController {
         PageHelper.startPage(index, size);
         StuUserExample stuUserExample = new StuUserExample();
         StuUserExample.Criteria criteria = stuUserExample.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId).andStatusEqualTo(0);
+        criteria.andSchoolIdEqualTo(schoolId).andStatusEqualTo(0).andRoleIdEqualTo(4);
         if (StringUtils.isNotBlank(studentId)) {
             criteria.andStudentIdEqualTo(studentId);
         }
@@ -407,7 +407,7 @@ public class UserController {
     public ResultEntity<HttpStatus> updateStudent(@ApiParam("学校ID必传") @RequestBody StuUser stuUser) {
         StuUserExample example = new StuUserExample();
         if (StringUtils.isNotBlank(stuUser.getStudentId())) {
-            example.createCriteria().andStudentIdEqualTo(stuUser.getStudentId()).andSchoolIdEqualTo(stuUser.getSchoolId());
+            example.createCriteria().andStudentIdEqualTo(stuUser.getStudentId()).andSchoolIdEqualTo(stuUser.getSchoolId()).andRoleIdEqualTo(4);
         }
         List<StuUser> stuUsers = stuUserMapper.selectByExample(example);
         if (!stuUsers.isEmpty()) {
@@ -458,7 +458,7 @@ public class UserController {
                           @RequestParam String schoolId) {
         StuUserExample userTableExample = new StuUserExample();
         StuUserExample.Criteria criteria = userTableExample.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId);
+        criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4);
         if (StringUtils.isNotBlank(classId)) {
             criteria.andClassIdEqualTo(classId);
         }
@@ -514,7 +514,7 @@ public class UserController {
     @ApiOperation("考试人数和考试次数")
     public ResultEntity<Map<Long, Long>> getStudentExamCountAndStudentCount(String schoolId) {
         StuUserExample stuUserExample = new StuUserExample();
-        stuUserExample.createCriteria().andSchoolIdEqualTo(schoolId).andExamStatusEqualTo("true");
+        stuUserExample.createCriteria().andSchoolIdEqualTo(schoolId).andExamStatusEqualTo("true").andRoleIdEqualTo(4);
         //考试人数
         long examPeopleCount = stuUserMapper.countByExample(stuUserExample);
 
diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
index e6a930b..b423697 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
@@ -47,7 +47,7 @@ public interface StuUserMapper {
 
 
     @Select("<script>" +
-            "select  COUNT(*) FROM stu_userinfo WHERE class_id IN("
+            "select  COUNT(*) FROM stu_userinfo WHERE role_id = 4 and class_id IN("
             +"<foreach collection='classIdList' separator=',' item='id'>"
             + "#{id} "
             + "</foreach> "
@@ -58,7 +58,7 @@ public interface StuUserMapper {
 //    int selectNumByClass(@Param("s") String s);
 
     @Select("<script>" +
-            "SELECT userid, name FROM stu_userinfo WHERE userid IN ("
+            "SELECT userid, name FROM stu_userinfo WHERE role_id = 4 and userid IN ("
             + "<foreach collection='userIds' separator=',' item='id'>"
             + "#{id}"
             + "</foreach>"
diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java
index dac5b00..6112a98 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java
@@ -15,9 +15,9 @@ import java.util.List;
  * @Date 2024/3/19
  */
 public interface ITeaGradeManageService {
-    PageInfo<TeaTrainingInfoDTO> getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId,String userId);
+    PageInfo<TeaTrainingInfoDTO> getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId);
 
-    void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId,String userId);
+    void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId);
 
     TeaExaminationDetailsDto getCountChart(String examManageId, String classId);
 
diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java
index e43ae66..7fd9633 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java
@@ -49,8 +49,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService {
 
 
     @Override
-    public PageInfo<TeaTrainingInfoDTO> getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId, String userId) {
-        List<TeaTrainingInfoDTO> list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId, userId);
+    public PageInfo<TeaTrainingInfoDTO> getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId) {
+        List<TeaTrainingInfoDTO> list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId);
         assert list != null;
         list.sort(new TotalScoreComparator());
         int i = 0;
@@ -69,8 +69,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService {
      * @Date 2024/3/19
      */
     @Override
-    public void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId, String userId) {
-        List<TeaTrainingInfoDTO> list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId, userId);
+    public void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId) {
+        List<TeaTrainingInfoDTO> list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId);
         //导出的表名
         String title = IdUtil.simpleUUID();
         //表中第一行表头字段
@@ -286,10 +286,10 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService {
     }
 
 
-    private List<TeaTrainingInfoDTO> getTeaTrainingInfoDTOS(String schoolId, String keyWord, String classId, String userId) {
+    private List<TeaTrainingInfoDTO> getTeaTrainingInfoDTOS(String schoolId, String keyWord, String classId) {
         StuUserExample userExample = new StuUserExample();
         StuUserExample.Criteria criteria = userExample.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId);
+        criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4);
         if (StringUtils.isNotBlank(classId)) {
             criteria.andClassIdEqualTo(classId);
         }
diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java
index 0fca722..78b32c5 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaUserServiceImpl.java
@@ -52,7 +52,7 @@ public class TeaUserServiceImpl implements ITeaUserService {
     public List<SysLoginLog> getLogList(String schoolId, String studentId, String classId) {
         StuUserExample userExample = new StuUserExample();
         StuUserExample.Criteria criteria = userExample.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId);
+        criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4);
         if (StringUtils.isNotBlank(studentId)) {
             criteria.andStudentIdEqualTo(schoolId);
         }
diff --git a/src/main/resources/mapper/StuUserMapper.xml b/src/main/resources/mapper/StuUserMapper.xml
index 8eafd45..f8a05e3 100644
--- a/src/main/resources/mapper/StuUserMapper.xml
+++ b/src/main/resources/mapper/StuUserMapper.xml
@@ -397,6 +397,7 @@
         JOIN training_report r ON u.userid = r.user_id
         JOIN stu_class sc ON u.class_id = sc.class_id
         where
+        u.role_id = 4
         u.school_id = #{schoolId}
         <if test="classId != null and classId !=''">
             AND u.class_id = #{classId}
@@ -416,7 +417,8 @@
         FROM (
         SELECT class_id, COUNT(*) AS user_count
         FROM stu_userinfo
-        WHERE class_id IN (SELECT class_id
+        WHERE role_id = 4
+        AND class_id IN (SELECT class_id
         FROM tea_and_student_exam
         WHERE exam_manage_id = #{examManageId}
         <if test="classId != null and classId != &quot;&quot;">