From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
index deb23cf..4fd310a 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
@@ -404,25 +404,25 @@
     }
 
     @Override
-    public void maxGrade(ExamPaperAnswer examPaperAnswer) {
-        // 鑾峰彇鏌愪竴鍦鸿�冭瘯鐨勬渶楂樻垚缁�
+    public void maxGrade(ExamPaperAnswer examPaperAnswer, Integer templateId) {
+        // 鑾峰彇鏌愪竴鍦鸿�冭瘯鏇剧粡鐨勬渶楂樻垚缁�
         ExamPaperAnswer maxGrade;
         if (Objects.equals(examPaperAnswer.getPaperType(), 7)) {
-            maxGrade = examPaperAnswerMapper.getTemplateOtherExamAnswer(examPaperAnswer);
+            maxGrade = examPaperAnswerMapper.getTemplateOtherExamAnswer(examPaperAnswer, templateId);
         } else {
             maxGrade = examPaperAnswerMapper.getPaperOtherExamAnswer(examPaperAnswer);
         }
         if (Objects.isNull(maxGrade)) {
             return;
         }
-        // 鏈涓嶆槸鏈�楂樺垎
-        if (!Objects.equals(maxGrade.getId(), examPaperAnswer.getId())) {
+        // 鏈鑰冭瘯鍒嗘暟涓嶅涔嬪墠锛屾湰娆℃棤鏁�
+        if (maxGrade.getUserScore() > examPaperAnswer.getUserScore()) {
             // 涔嬪墠鐨勬垚缁╂湁鏁�
             maxGrade.setInvalid(AnswerInvalidEnum.VALID);
-            examPaperAnswerMapper.updateByPrimaryKey(maxGrade);
+            examPaperAnswerMapper.updateByPrimaryKeySelective(maxGrade);
             // 鏈鐨勪笉鏄渶楂樺垎锛屾棤鏁�
             examPaperAnswer.setInvalid(AnswerInvalidEnum.INVALID);
-            examPaperAnswerMapper.updateByPrimaryKey(examPaperAnswer);
+            examPaperAnswerMapper.updateByPrimaryKeySelective(examPaperAnswer);
         }
     }
 

--
Gitblit v1.8.0