|
@@ -58,7 +58,7 @@ public class JxyQueryDaoImpl implements JxyQueryDao {
|
|
public Page<ErrorModel> errorList(Map<String, Object> params, Pageable initPage) {
|
|
public Page<ErrorModel> errorList(Map<String, Object> params, Pageable initPage) {
|
|
StringBuilder selSQL = new StringBuilder();
|
|
StringBuilder selSQL = new StringBuilder();
|
|
List<Object> queryParams = new ArrayList<Object>();
|
|
List<Object> queryParams = new ArrayList<Object>();
|
|
- selSQL.append("SELECT t.homework_picture_id as id,t12.child_name,t13.league_name,t.create_time,t.error_reason_code,t11.file_key,t11.`subject`,t11.create_time as upload_time \n");
|
|
|
|
|
|
+ selSQL.append("SELECT t.homework_picture_id as id,t12.grade,t12.child_name,t13.league_name,t.create_time,t.error_reason_code,t11.file_key,t11.`subject`,t11.create_time as upload_time \n");
|
|
selSQL.append("from scon_homework_idetify_error t \n");
|
|
selSQL.append("from scon_homework_idetify_error t \n");
|
|
selSQL.append("left join scon_homework_picture t11 on t.homework_picture_id = t11.id\n");
|
|
selSQL.append("left join scon_homework_picture t11 on t.homework_picture_id = t11.id\n");
|
|
selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
|
|
selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
|
|
@@ -113,16 +113,19 @@ public class JxyQueryDaoImpl implements JxyQueryDao {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<Map<String, Object>> findAnswerList(String questionIds) {
|
|
|
|
|
|
+ public List<Map<String, Object>> findAnswerList(String bookId,String pageNos) {
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
sb.append(" select t2.id question_id, t2.big_question_index, t2.small_question_name small_question_index,")
|
|
sb.append(" select t2.id question_id, t2.big_question_index, t2.small_question_name small_question_index,")
|
|
.append(" t3.answer option_answer, t3.answer_json,t2.book_course_id, t2.num")
|
|
.append(" t3.answer option_answer, t3.answer_json,t2.book_course_id, t2.num")
|
|
.append(" from kmt_exercise_questions t2 ")
|
|
.append(" from kmt_exercise_questions t2 ")
|
|
- .append(" LEFT JOIN q_question_info t3 ON t2.id = t3.id where t2.id in (")
|
|
|
|
- .append(questionIds.replace("[","").replace("]","").replace("\"","'"))
|
|
|
|
- .append(") ")
|
|
|
|
|
|
+ .append(" LEFT JOIN q_question_info t3 ON t2.id = t3.id ")
|
|
|
|
+ .append(" left join q_question_workbook t4 on t3.id = t4.question_id ")
|
|
|
|
+ .append("where t4.page_index in (")
|
|
|
|
+ .append(pageNos.replace("[","").replace("]",""))
|
|
|
|
+ .append(") and t4.book_id=?")
|
|
.append("order by t2.num");
|
|
.append("order by t2.num");
|
|
List<Object> params = new ArrayList<>();
|
|
List<Object> params = new ArrayList<>();
|
|
|
|
+ params.add(bookId);
|
|
return dao.findMap(sb.toString(),params.toArray());
|
|
return dao.findMap(sb.toString(),params.toArray());
|
|
}
|
|
}
|
|
|
|
|