|
@@ -338,7 +338,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
|
|
*/
|
|
*/
|
|
private Page<ExamRecordInfo> _getExamRecordDetailListForPage(ExamRecordQuery query) {
|
|
private Page<ExamRecordInfo> _getExamRecordDetailListForPage(ExamRecordQuery query) {
|
|
//分页条件
|
|
//分页条件
|
|
- int currentNum = (query.getPageNo() - 1) * query.getPageSize();
|
|
|
|
|
|
+// int currentNum = (query.getPageNo() - 1) * query.getPageSize();
|
|
Check.isNull(query, "查询参数不能为空!");
|
|
Check.isNull(query, "查询参数不能为空!");
|
|
Check.isNull(query.getExamId(), "请先选择考试批次!");
|
|
Check.isNull(query.getExamId(), "请先选择考试批次!");
|
|
//查询条件
|
|
//查询条件
|
|
@@ -348,9 +348,9 @@ public class ExamRecordServiceImpl implements ExamRecordService {
|
|
sqlBuilder.append(condition);
|
|
sqlBuilder.append(condition);
|
|
String otherCondition = " and ((record_data.is_warn = 0) OR (record_data.is_warn = 1 and record_data.is_audit = 1))";
|
|
String otherCondition = " and ((record_data.is_warn = 0) OR (record_data.is_warn = 1 and record_data.is_audit = 1))";
|
|
sqlBuilder.append(otherCondition);
|
|
sqlBuilder.append(otherCondition);
|
|
- String idBuilder = "select id from ec_oe_exam_record_data record_data where 1 = 1" + condition + otherCondition+
|
|
|
|
- " order by record_data.id desc limit " + currentNum + ",1 ";
|
|
|
|
- sqlBuilder.append(" and record_data.id <=(").append(idBuilder).append(")");
|
|
|
|
|
|
+// String idBuilder = "select id from ec_oe_exam_record_data record_data where 1 = 1" + condition + otherCondition+
|
|
|
|
+// " order by record_data.id desc limit " + currentNum + ",1 ";
|
|
|
|
+// sqlBuilder.append(" and record_data.id <=(").append(idBuilder).append(")");
|
|
sqlBuilder.append(" group by record_data.id ");
|
|
sqlBuilder.append(" group by record_data.id ");
|
|
//根据ip查询
|
|
//根据ip查询
|
|
/*if (StringUtils.isNoneBlank(query.getIp())) {
|
|
/*if (StringUtils.isNoneBlank(query.getIp())) {
|