From 227bea3b08df87e36af75f193acaa81a8a1f6e19 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 12 Jan 2023 19:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/exam/api/AloneExamExtendApi.java | 8 ++++++-- .../module/exam/service/impl/AloneExamServiceImpl.java | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java index b75fa9b6..ae65b6b2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java @@ -1,6 +1,5 @@ package com.xboe.module.exam.api; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -132,7 +131,12 @@ public class AloneExamExtendApi extends ApiBaseController { if(StringUtil.isBlank(query.getTestId())){ return badRequest("参数异常"); } - + if(query.getPageSize()==null) { + query.setPageSize(100); + } + if(query.getPageIndex()==null) { + query.setPageIndex(1); + } try { PageList rs=aloneExamService.findTestUserAnswers(query); return success(rs); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java index 9099ce7f..263f836f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java @@ -354,7 +354,7 @@ public class AloneExamServiceImpl implements IAloneExamService{ + "sum(CASE WHEN a.score < t.pass_line THEN 1 ELSE 0 END) as nptotal " + "from boe_exam_alone a inner join boe_exam_test t on a.test_id=t.id " + "where a.test_id=?1"; - List objsList= dao.findListFields(sql,testId); + List objsList= dao.sqlFindList(sql,testId); Map rs=new HashMap(); Object[] objs=objsList.get(0); rs.put("total",objs[0]); @@ -399,7 +399,8 @@ public class AloneExamServiceImpl implements IAloneExamService{ } //查询用户的答卷 QueryBuilder query2=QueryBuilder.from(AloneExamAnswer.class); - query2.addField("new AloneExamAnswer(id,aid,name,passLine,status,startTime,endTime,lastTime,ucode,score,totalScore,realScore,useSecond,testDuration)"); + query2.addField("new AloneExamAnswer(id,aid,name,passLine,status,startTime,endTime,lastTime,ucode,score,totalScore,realScore,useSecond,aloneId,testDuration)"); + //String id, String aid, String name, Integer passLine, Integer status, LocalDateTime startTime, LocalDateTime endTime,LocalDateTime lastTime, String ucode,Float score,Float totalScore,Float realScore,Integer useSecond,String aloneId,Integer testDuration query2.addFilter(FieldFilters.in("aloneId",aloneIds)); query2.addFilter(FieldFilters.eq("testId",params.getTestId())); query2.addOrder(OrderCondition.asc("startTime"));