From fa8aa0a9992c8c699c812b2e5d729bb743648364 Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Fri, 9 Oct 2020 18:21:23 +0800
Subject: [PATCH] =?UTF-8?q?v1.0=E5=AE=8C=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ClassTeachingController.java   |  8 +++++---
 .../impl/EvaluationRecordServiceImpl.java     | 20 +++++++++++++++++--
 .../resources/mapper/tms/ClassTeachingDao.xml |  2 +-
 .../mapper/tms/ExperimentalStudentDao.xml     |  4 ++--
 src/main/resources/mapper/tms/UserInfoDao.xml |  4 ++--
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java
index 6970b6e..c38c7ab 100644
--- a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java
+++ b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java
@@ -71,7 +71,7 @@ public class ClassTeachingController implements ClassTeachingApi {
      */
     @Override
     @GetMapping("/checkInvitationCode")
-    public R check(@RequestParam Integer userId,@RequestParam Integer projectId){
+    public R check(@RequestParam Integer userId,@RequestParam("id") Integer projectId){
         List o = experimentalStudentService.queryIsCode(userId,projectId);
         if (o.size()>0){
             return R.ok();
@@ -91,6 +91,7 @@ public class ClassTeachingController implements ClassTeachingApi {
     public R joinPractice(@RequestBody ExperimentalTeachingEntity entity1){
         //获取参数
         Integer projectId = entity1.getProjectId();
+        Integer id = entity1.getId();
         Integer invitationCode = entity1.getInvitationCode();
         Integer userId = entity1.getUserId();
         //用于接受参数
@@ -100,11 +101,12 @@ public class ClassTeachingController implements ClassTeachingApi {
 
         //if (isCode==0)
             if (invitationCode!=null){
-                entity.setProjectId(projectId);
+                entity.setId(id);
+//                entity.setProjectId(projectId);
                 ExperimentalTeachingEntity result= classTeachingService.queryInvitationcode(entity);//邀请码唯一
                 Integer code = result.getInvitationCode();
                 if (invitationCode.equals(code)==true){
-                    ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(projectId);
+                    ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id);
                     experimentalStudentService.saveCode(student);
                     return R.ok();
                 }else{
diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java
index c0283c5..6c697e5 100644
--- a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -318,6 +319,7 @@ public class EvaluationRecordServiceImpl extends ServiceImpl<EvaluationRecordDao
                                        String userAnswer) {
         //1、根据当前传递的evaluationRecordId和currentQuestionSortNo查询当前试题
         EvaluationQuestionVO evaluationQuestionVO = evaluationQuestionDao.selectByInfo(evaluationRecordId, currentQuestionSortNo);
+
         if (evaluationQuestionVO == null) {
             ExceptionCast.cast(CommonCode.INVALID_PARAM);
         }
@@ -325,6 +327,19 @@ public class EvaluationRecordServiceImpl extends ServiceImpl<EvaluationRecordDao
         Integer questionPoints = evaluationQuestionVO.getQuestionPoints();
         //正确答案
         String answer = evaluationQuestionVO.getAnswer();
+
+        String userString = "";
+        String answerString = "";
+        char[] arr = userAnswer.toCharArray();
+        Arrays.sort(arr);
+        for (char a : arr){
+            userString = userString + String.valueOf(a);
+        }
+        char[] array = answer.toCharArray();
+        Arrays.sort(array);
+        for (char b : array){
+            answerString = answerString + String.valueOf(b);
+        }
         //修改当前试题状态
         //记录用户的答案
         //判断当前试题正误
@@ -333,13 +348,14 @@ public class EvaluationRecordServiceImpl extends ServiceImpl<EvaluationRecordDao
         evaluationQuestion.setId(evaluationQuestionVO.getId());
         evaluationQuestion.setUserAnswer(userAnswer);
         //如果用户答案为空，则设置状态为未作，设为错，得分设为0
-        if (StringUtils.isEmpty(userAnswer)) {
+//        if (StringUtils.isEmpty(userAnswer)) {
+        if (StringUtils.isEmpty(userString)) {
             evaluationQuestion.setQuestionStatus(Constant.QuestionStatus.NOT_MADE.getType());
             evaluationQuestion.setIsTure(Constant.QuestionIsTure.FALSE.getType());
             evaluationQuestion.setQuestionScore(0);
         } else {
             evaluationQuestion.setQuestionStatus(Constant.QuestionStatus.MADE.getType());
-            if (!answer.equals(userAnswer)) {
+            if (!answerString.equals(userString)) {
                 evaluationQuestion.setIsTure(Constant.QuestionIsTure.FALSE.getType());
                 evaluationQuestion.setQuestionScore(0);
             } else {
diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml
index 783223b..d33d843 100644
--- a/src/main/resources/mapper/tms/ClassTeachingDao.xml
+++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.msdw.tms.dao.ClassTeachingDao">
 
     <select id="queryInvitationCode" resultType="com.msdw.tms.entity.ExperimentalTeachingEntity">
-        select invitation_code from tms_experimental_teaching where project_id = #{projectId}
+        select invitation_code from tms_experimental_teaching where id = #{id}
     </select>
 
     <select id="getByClassRecord" resultType="com.msdw.tms.entity.ExperimentalTeachingEntity">
diff --git a/src/main/resources/mapper/tms/ExperimentalStudentDao.xml b/src/main/resources/mapper/tms/ExperimentalStudentDao.xml
index b5fd886..009b806 100644
--- a/src/main/resources/mapper/tms/ExperimentalStudentDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalStudentDao.xml
@@ -3,10 +3,10 @@
 <mapper namespace="com.msdw.tms.dao.ExperimentalStudentDao">
 
     <select id="queryIsCode" resultType="Map">
-        SELECT userId FROM tms_experimental_student WHERE userId = #{userId} AND projectId = #{projectId}
+        SELECT userId FROM tms_experimental_student WHERE userId = #{userId} AND id = #{projectId}
     </select>
 
     <insert id="saveCode" parameterType="com.msdw.tms.entity.ExperimentalStudentEntity">
-        INSERT INTO tms_experimental_student(projectId,userId) VALUES (#{projectId},#{userId})
+        INSERT INTO tms_experimental_student(projectId,userId) VALUES (#{id},#{userId})
     </insert>
  </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml
index 2f8a991..7a7f05a 100644
--- a/src/main/resources/mapper/tms/UserInfoDao.xml
+++ b/src/main/resources/mapper/tms/UserInfoDao.xml
@@ -49,8 +49,8 @@
                 schoolId = #{schoolId},
             </if>
             <if test="phone !=null">
-                phone #{phone}
-            </if>>
+                phone = #{phone}
+            </if>
         </set>
         WHERE userId = #{userId};