|
|
@ -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
|
|
|
|