diff --git a/src/main/java/club/joylink/rtss/services/paper/PaperUserFindPageService.java b/src/main/java/club/joylink/rtss/services/paper/PaperUserFindPageService.java index cc66ac402..72a29e241 100644 --- a/src/main/java/club/joylink/rtss/services/paper/PaperUserFindPageService.java +++ b/src/main/java/club/joylink/rtss/services/paper/PaperUserFindPageService.java @@ -74,10 +74,8 @@ public class PaperUserFindPageService { public PageVO findPaperUserByPageForClass(PageUserDetailQuery req){ log.info(req.toString()); BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数"); - PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId()); PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在"); - req.setOrgRole(BusinessConsts.OrgRole.Student.name()); PageHelper.clearPage(); PageHelper.startPage(req.getPageNum(),req.getPageSize()); @@ -90,12 +88,9 @@ public class PaperUserFindPageService { public CurveForClassVO curveForClass(PageUserDetailQuery req){ log.info(req.toString()); BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(req.getPcId()) || Objects.isNull(req.getOrgId()) ,"缺少必要的参数"); - PaperComposition pc = paperCompositionDAO.selectByPrimaryKey(req.getPcId()); PaperExceptionAssert.PcExisted.assertNotNull(pc,"试卷定义不存在"); - req.setOrgRole(BusinessConsts.OrgRole.Student.name()); - List sqlPage = this.paperUserDAO.selectDetail(req); CurveForClassVO ccvo = CurveForClassVO.convertTo(pc,sqlPage); return ccvo; diff --git a/src/main/java/club/joylink/rtss/vo/paper/CurveForClassVO.java b/src/main/java/club/joylink/rtss/vo/paper/CurveForClassVO.java index ca854cc58..7bf13f89b 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/CurveForClassVO.java +++ b/src/main/java/club/joylink/rtss/vo/paper/CurveForClassVO.java @@ -27,7 +27,7 @@ public class CurveForClassVO { if(CollectionUtils.isEmpty(detailVOs)){ return new CurveForClassVO(); } - PageUserDetailVO dvo = detailVOs.get(0); +// PageUserDetailVO dvo = detailVOs.get(0); List sdList = Lists.newArrayList(); for (PageUserDetailVO vo : detailVOs) { sdList.add(new ScoreDetail(vo.getUserId(),vo.getNickname(), Objects.isNull(vo.getScore()) ? 0 : vo.getScore()));