Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -174,9 +174,12 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 		Map<Long, List<ExamReview>> registReviewMap = examReviews.stream().collect(Collectors.groupingBy(ExamReview::getExamRegistrationId));
 		List<StudentExamResult> needUpdateStudentExamResult = new ArrayList<>();
 		for (Map.Entry<Long, List<ExamReview>> registReviewEntry : registReviewMap.entrySet()) {
+			List<ExamReview> reviews = registReviewEntry.getValue().stream().filter(e->Objects.nonNull(e.getEvaluationResult())).collect(Collectors.toList());
+			if(CollectionUtils.isEmpty(reviews)){
+				continue;
+			}
 			StudentExamResult studentExamResult=new StudentExamResult();
 			studentExamResult.setExamRegistrationId(registReviewEntry.getKey());
-			List<ExamReview> reviews = registReviewEntry.getValue();
 			long totalScore = reviews.stream().mapToLong(ExamReview::getEvaluationResult).sum();
 			BigDecimal avgScore = new BigDecimal(totalScore).divide(new BigDecimal(reviews.size()), 2, BigDecimal.ROUND_CEILING);
 			studentExamResult.setAvgScore(avgScore.floatValue());

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -141,7 +141,7 @@
 				AND DATE_FORMAT( ero.exam_start_time_, '%Y-%m-%d' ) BETWEEN  DATE_FORMAT( #{examStartTime}, '%Y-%m-%d' ) AND DATE_FORMAT( #{examEndTime}, '%Y-%m-%d' )
 			</if>
 			<if test="search!=null and search!=''">
-				AND (ere.card_no_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR stu.real_name_ LIKE CONCAT('%', #{search}, '%'))
+				AND (ere.id_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR stu.real_name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 		</where>
 	</sql>