yin 11 luni în urmă
părinte
comite
5be6388dce

+ 2 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -289,6 +289,7 @@ public interface ExamStudentDao
     @Query("update ExamStudent s set s.inspectCount=?2 where s.id=?1 ")
 	public void updateInspectCount(Integer studentId, Integer inspectCount);
 
-    public ExamStudent findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(Integer examId, Integer schoolId,
+    @Query("select s from ExamStudent s where s.schoolId=?1 and s.examId=?2 and s.subjectCode=?3 and s.studentCode=?4 ")
+    public ExamStudent findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( Integer schoolId,Integer examId,
                                                                            String subjectCode, String studentCode);
 }

+ 1 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamStudentService.java

@@ -213,5 +213,5 @@ public interface ExamStudentService {
 
 	public void updateInspectCount(Integer studentId, Integer inspectCount);
 
-    ExamStudent findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(Integer examId, Integer schoolId, String subjectCode, String studentCode);
+    ExamStudent findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( Integer schoolId,Integer examId, String subjectCode, String studentCode);
 }

+ 2 - 3
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -1657,9 +1657,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     }
 
     @Override
-    public ExamStudent findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(Integer examId, Integer schoolId,
-                                                                           String subjectCode, String studentCode) {
-        return studentDao.findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(examId, schoolId, subjectCode,
+    public ExamStudent findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( Integer schoolId,Integer examId, String subjectCode, String studentCode){
+        return studentDao.findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( schoolId,examId, subjectCode,
                 studentCode);
     }
 }

+ 5 - 5
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamStudentController.java

@@ -297,14 +297,14 @@ public class ExamStudentController extends BaseApiController {
         JSONObject obj = new JSONObject();
         ExamStudent student = null;
         try {
-            if (Strings.isNullOrEmpty(examSeqCode)) {
-                student = studentService.findBySchoolIdAndSubjectCodeAndStudentCode(schoolId, subjectCode, studentCode);
+            if (StringUtils.isNotBlank(examSeqCode)) {
+                student = studentService.findBySchoolIdAndSubjectCodeAndStudentCodeAndRemark(schoolId, subjectCode,
+                        studentCode, examSeqCode);
             } else if (examId != null) {
-                student = studentService.findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(examId, schoolId,
+                student = studentService.findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( schoolId,examId,
                         subjectCode, studentCode);
             } else {
-                student = studentService.findBySchoolIdAndSubjectCodeAndStudentCodeAndRemark(schoolId, subjectCode,
-                        studentCode, examSeqCode);
+                student = studentService.findBySchoolIdAndSubjectCodeAndStudentCode(schoolId, subjectCode, studentCode);
             }
             if (student != null) {
                 DecimalFormat df = new DecimalFormat("####.###");