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 @@ + cn.hutool hutool-all 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 teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) { + List userList1 = sysUserMapper.selectClassStuNumberName(); + long total = userList1.size(); + List users1 = sysUserMapper.selectByNameStuNum(stuClass, keyWord); + long total2 = users1.size(); PageHelper.startPage(index, size); List reportDtoList = new ArrayList<>(); if (stuClass != null || keyWord != null) { @@ -161,7 +168,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { } } } - return new PageInfo<>(reportDtoList); + PageInfo pageInfo = new PageInfo<>(); + pageInfo.setTotal(total2); + return pageInfo; } List userList = sysUserMapper.selectClassStuNumberName(); for (SysUser sysUser : userList) { @@ -192,7 +201,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { } } } - return new PageInfo<>(reportDtoList); + PageInfo pageInfo= new PageInfo<>(reportDtoList); + pageInfo.setTotal(total); + return pageInfo; } @Override