From e922d0262be7d3ae50e868d9a0bc9c89953c38a1 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Thu, 24 Aug 2023 14:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=94=A8=E6=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/entity/SysUser.java  |  5 ++---
 ruoyi-system/pom.xml                              |  1 +
 .../service/impl/SysTrainingScoreServiceImpl.java | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d49f95c..27db814 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -30,7 +30,7 @@ public class SysUser extends BaseEntity {
     /**
      * 部门ID
      */
-    @Excel(name = "部门编号", type = Type.IMPORT)
+//    @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
     /**
@@ -42,7 +42,6 @@ public class SysUser extends BaseEntity {
     /**
      * 用户昵称
      */
-    @Excel(name = "用户名称")
     private String nickName;
 
     /**
@@ -104,7 +103,7 @@ public class SysUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "帐号状态（0=正常,1=停用）", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /**
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index cd15df8..7237af7 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -16,6 +16,7 @@
     </description>
 
     <dependencies>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java
index b999375..1849b1a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java
@@ -1,10 +1,13 @@
 package com.ruoyi.system.service.impl;
 
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.TrainingScoreConstants;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysGradeWeight;
 import com.ruoyi.system.domain.SysTrainingScore;
 import com.ruoyi.system.domain.SysTrainingScoreExample;
@@ -128,6 +131,10 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
 
     @Override
     public PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) {
+        List<SysUser> userList1 = sysUserMapper.selectClassStuNumberName();
+        long total = userList1.size();
+        List<SysUser> users1 = sysUserMapper.selectByNameStuNum(stuClass, keyWord);
+        long total2 = users1.size();
         PageHelper.startPage(index, size);
         List<ReportDto> reportDtoList = new ArrayList<>();
         if (stuClass != null || keyWord != null) {
@@ -161,7 +168,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
                     }
                 }
             }
-            return new PageInfo<>(reportDtoList);
+            PageInfo<ReportDto> pageInfo = new PageInfo<>();
+            pageInfo.setTotal(total2);
+            return pageInfo;
         }
         List<SysUser> userList = sysUserMapper.selectClassStuNumberName();
         for (SysUser sysUser : userList) {
@@ -192,7 +201,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
                 }
             }
         }
-        return new PageInfo<>(reportDtoList);
+        PageInfo<ReportDto> pageInfo= new PageInfo<>(reportDtoList);
+        pageInfo.setTotal(total);
+        return pageInfo;
     }
 
     @Override