joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

教学考试调整

Browse Source
This commit is contained in:
tiger_zhou 2022-12-09 17:33:30 +08:00
parent 68f31787e4
commit d6fbd17c55
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/club/joylink/rtss/services/paper/PaperUserFindPageService.java
View File

@ -74,10 +74,8 @@ public class PaperUserFindPageService {
public PageVO<PageUserDetailVO> findPaperUserByPageForClass(PageUserDetailQuery req){ public PageVO<PageUserDetailVO> findPaperUserByPageForClass(PageUserDetailQuery req){
log.info(req.toString()); log.info(req.toString());
BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数"); BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数");
PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId()); PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId());
PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在"); PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在");
req.setOrgRole(BusinessConsts.OrgRole.Student.name()); req.setOrgRole(BusinessConsts.OrgRole.Student.name());
PageHelper.clearPage(); PageHelper.clearPage();
PageHelper.startPage(req.getPageNum(),req.getPageSize()); PageHelper.startPage(req.getPageNum(),req.getPageSize());
@ -90,12 +88,9 @@ public class PaperUserFindPageService {
public CurveForClassVO curveForClass(PageUserDetailQuery req){ public CurveForClassVO curveForClass(PageUserDetailQuery req){
log.info(req.toString()); log.info(req.toString());
BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数"); BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数");
PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId()); PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId());
PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在"); PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在");
req.setOrgRole(BusinessConsts.OrgRole.Student.name()); req.setOrgRole(BusinessConsts.OrgRole.Student.name());
List<PageUserDetailVO> sqlPage = this.paperUserDAO.selectDetail(req); List<PageUserDetailVO> sqlPage = this.paperUserDAO.selectDetail(req);
CurveForClassVO ccvo = CurveForClassVO.convertTo(pc,sqlPage); CurveForClassVO ccvo = CurveForClassVO.convertTo(pc,sqlPage);
return ccvo; return ccvo;

2
src/main/java/club/joylink/rtss/vo/paper/CurveForClassVO.java
View File

@ -27,7 +27,7 @@ public class CurveForClassVO {
if(CollectionUtils.isEmpty(detailVOs)){ if(CollectionUtils.isEmpty(detailVOs)){
return new CurveForClassVO(); return new CurveForClassVO();
} }
PageUserDetailVO dvo = detailVOs.get(0); // PageUserDetailVO dvo = detailVOs.get(0);
List<ScoreDetail> sdList = Lists.newArrayList(); List<ScoreDetail> sdList = Lists.newArrayList();
for (PageUserDetailVO vo : detailVOs) { for (PageUserDetailVO vo : detailVOs) {
sdList.add(new ScoreDetail(vo.getUserId(),vo.getNickname(), Objects.isNull(vo.getScore()) ? 0 : vo.getScore())); sdList.add(new ScoreDetail(vo.getUserId(),vo.getNickname(), Objects.isNull(vo.getScore()) ? 0 : vo.getScore()));