修改分页查询接口,导入导出字段,用户新增方法

master
xiaoCJ 2 years ago
parent bdcfe7a75a
commit e922d0262b

@ -30,7 +30,7 @@ public class SysUser extends BaseEntity {
/** /**
* ID * ID
*/ */
@Excel(name = "部门编号", type = Type.IMPORT) // @Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId; private Long deptId;
/** /**
@ -42,7 +42,6 @@ public class SysUser extends BaseEntity {
/** /**
* *
*/ */
@Excel(name = "用户名称")
private String nickName; private String nickName;
/** /**
@ -104,7 +103,7 @@ public class SysUser extends BaseEntity {
/** /**
* 0 1 * 0 1
*/ */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") @Excel(name = "帐号状态0=正常,1=停用)", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** /**

@ -16,6 +16,7 @@
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>

@ -1,10 +1,13 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.TrainingScoreConstants; 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.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; 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.SysGradeWeight;
import com.ruoyi.system.domain.SysTrainingScore; import com.ruoyi.system.domain.SysTrainingScore;
import com.ruoyi.system.domain.SysTrainingScoreExample; import com.ruoyi.system.domain.SysTrainingScoreExample;
@ -128,6 +131,10 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
@Override @Override
public PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) { 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); PageHelper.startPage(index, size);
List<ReportDto> reportDtoList = new ArrayList<>(); List<ReportDto> reportDtoList = new ArrayList<>();
if (stuClass != null || keyWord != null) { 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(); List<SysUser> userList = sysUserMapper.selectClassStuNumberName();
for (SysUser sysUser : userList) { 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 @Override

Loading…
Cancel
Save