教学考试调整

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

View File

@ -74,10 +74,8 @@ public class PaperUserFindPageService {
public PageVO<PageUserDetailVO> 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<PageUserDetailVO> sqlPage = this.paperUserDAO.selectDetail(req);
CurveForClassVO ccvo = CurveForClassVO.convertTo(pc,sqlPage);
return ccvo;

View File

@ -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<ScoreDetail> sdList = Lists.newArrayList();
for (PageUserDetailVO vo : detailVOs) {
sdList.add(new ScoreDetail(vo.getUserId(),vo.getNickname(), Objects.isNull(vo.getScore()) ? 0 : vo.getScore()));