|
@@ -60,7 +60,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
sql.append(
|
|
|
" t.is_upload upload,t.is_breach breach,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
|
|
|
sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime,sub.total_score subjectScore");
|
|
|
- sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
|
|
|
+ sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
|
|
|
sql.append(" left join eb_exam_subject sub on t.exam_id=sub.exam_id and t.subject_code=sub.code");
|
|
|
sql.append(" left join b_user u on t.score_verify_user=u.id where r.exam_id=" + req.getExamId()+" and r.user_id="+req.getUserId());
|
|
|
sql.append(" order by t.student_code,t.subject_code ");
|
|
@@ -81,7 +81,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
StringBuilder sql = new StringBuilder();
|
|
|
sql.append("select count(1) ");
|
|
|
sql.append(
|
|
|
- "from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId + " and t.viewed =0 ");
|
|
|
+ "from eb_score_verify t inner join eb_exam_student s on t.student_id=s.id where t.exam_id=" + examId+" and t.user_id="+userId + " and t.viewed =0 ");
|
|
|
Query query = entityManager.createNativeQuery(sql.toString());
|
|
|
return Integer.valueOf(query.getResultList().get(0).toString());
|
|
|
}
|
|
@@ -90,7 +90,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
public Integer countByQuery(Integer examId, Integer userId) {
|
|
|
StringBuilder sql = new StringBuilder();
|
|
|
sql.append("select count(1) ");
|
|
|
- sql.append("from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId);
|
|
|
+ sql.append("from eb_score_verify t inner join eb_exam_student s on t.student_id=s.id where t.exam_id=" + examId+" and t.user_id="+userId);
|
|
|
Query query = entityManager.createNativeQuery(sql.toString());
|
|
|
return Integer.valueOf(query.getResultList().get(0).toString());
|
|
|
}
|
|
@@ -99,7 +99,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
@Override
|
|
|
public Boolean existByExamIdAndUserId(Integer examId, Integer userId) {
|
|
|
StringBuilder sql = new StringBuilder();
|
|
|
- sql.append(" select r.id from eb_score_verify r where r.exam_id=" + examId+" and r.user_id="+userId);
|
|
|
+ sql.append(" select r.id from eb_score_verify r inner join eb_exam_student s on r.student_id=s.id where r.exam_id=" + examId+" and r.user_id="+userId);
|
|
|
sql.append(" limit 1");
|
|
|
Query query = entityManager.createNativeQuery(sql.toString());
|
|
|
List<ScoreVerify> ret = query.getResultList();
|
|
@@ -274,7 +274,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
sql.append(
|
|
|
" t.is_upload upload,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
|
|
|
sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime ");
|
|
|
- sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
|
|
|
+ sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
|
|
|
sql.append(" left join b_user u on t.score_verify_user=u.id where r.exam_id=" + examId+" and r.user_id="+userId
|
|
|
+ " and t.score_verify_flagged =1 ");
|
|
|
sql.append(" order by t.student_code,t.subject_code ");
|
|
@@ -298,7 +298,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
|
|
|
sql.append(
|
|
|
" t.is_upload upload,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
|
|
|
sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime ");
|
|
|
- sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
|
|
|
+ sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
|
|
|
sql.append(" left join b_user u on t.score_verify_user=u.id where r.exam_id=" + examId+" and r.user_id="+userId
|
|
|
+ " and r.viewed =0 ");
|
|
|
sql.append(" order by t.student_code,t.subject_code ");
|