From 3e44fac6f85eeb6b9476e1d95e7323ae81fb80aa Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Sun, 9 Mar 2025 22:02:19 +0800
Subject: [PATCH 1/2] 3.9

---
 .../template/action/ToolTemplateAction.java   |   1 +
 .../dao/impl/WrongQuestionDaoImpl.java        |   3 +-
 .../target/classes/config.properties          |   2 +-
 HomeWork-java/tempResources/config.properties |   2 +-
 .../MultipleChoiceQuestions.vue               |   9 +-
 .../src/views/WrongManager/WrongQustions.vue  |  46 ++-
 homework-3.9.sql                              | 286 ++++++++++++++++++
 7 files changed, 332 insertions(+), 17 deletions(-)
 create mode 100644 homework-3.9.sql

diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index d82a00f..f88a00f 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -89,6 +89,7 @@ import java.util.*;
         Integer homework_id =Integer.parseInt(request.getParameter("homework_id"));
         Integer student_id =Integer.parseInt(request.getParameter("student_id"));
         List<Question> question = wrongQuestionService.getWrongQuestion(homework_id,student_id);
+        System.out.println(question);
         return R.ok().put("data",question);
     }
     //提交作业（简答题）
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
index b4b37f6..8b8dae7 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
@@ -57,7 +57,7 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao {
                 "\tJSON_ARRAYAGG(qo.option_value) AS optionStr\n" +
                 "FROM\n" +
                 "\tquestion q\n" +
-                "\tINNER JOIN question_option qo ON q.question_id = qo.question_id \n" +
+                "\tLEFT JOIN question_option qo ON q.question_id = qo.question_id \n" +
                 "WHERE\n" +
                 "\tq.question_id IN (\n" +
                 "\tSELECT\n" +
@@ -79,6 +79,7 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao {
                     question.setQuestion_id(rs.getInt("question_id"));
                     question.setTitle(rs.getString("title"));
                     question.setType(rs.getInt("type"));
+                    System.out.println("123"+rs.getString("optionStr"));
                     question.setOptionArr(rs.getString("optionStr"));
                     questions.add(question);
                 }
diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties
index 1b067ac..49cc81a 100644
--- a/HomeWork-java/target/classes/config.properties
+++ b/HomeWork-java/target/classes/config.properties
@@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6
 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60
 
 JDBC_DRIVER=com.mysql.jdbc.Driver
-JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework
+JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8
 
 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8
 JDBC_USERNAME=root
diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties
index 1b067ac..49cc81a 100644
--- a/HomeWork-java/tempResources/config.properties
+++ b/HomeWork-java/tempResources/config.properties
@@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6
 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60
 
 JDBC_DRIVER=com.mysql.jdbc.Driver
-JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework
+JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8
 
 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8
 JDBC_USERNAME=root
diff --git a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
index 1a94c8c..993e59a 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
@@ -39,7 +39,7 @@
 </template>
 <script setup>
 
-import { onMounted, reactive, ref, watch, toRaw } from 'vue';
+import { onMounted, reactive, ref, watch } from 'vue';
 import { HttpClient } from '@/network/HttpClient';
 import { useRoute } from 'vue-router';
 const questions = reactive([]);
@@ -61,13 +61,14 @@ const submitAnswers = () => {
         return;
     }
     getCurrentTime();
-    console.log(userAnswers);
+
     userAnswersJson = JSON.stringify(userAnswers.map((answer, index) => ({
         question_id: questions[index].id,
-        answer: Array.isArray(answer) ? answer : [answer] // 处理单选和多选题的答案格式统一
+        answer: Array.isArray(answer) ? answer : [answer],
+        type: questions[index].type
     })));
 
-    console.log(userAnswersJson);
+
 
     submitHomework()
 };
diff --git a/HomeWork-vite/src/views/WrongManager/WrongQustions.vue b/HomeWork-vite/src/views/WrongManager/WrongQustions.vue
index 03008c4..a13db6d 100644
--- a/HomeWork-vite/src/views/WrongManager/WrongQustions.vue
+++ b/HomeWork-vite/src/views/WrongManager/WrongQustions.vue
@@ -7,12 +7,31 @@
             <div v-for="(question, index) in questions" :key="question.id" class="question-item">
                 <div class="question-title">
                     {{ index + 1 }}. {{ question.title }}
-                    <span v-if="question.type === 'multiple'" style="color: #666; font-size: 0.9em">
+                    <span v-if="question.type === -1" style="color: #666; font-size: 0.9em">
+                        (判断题)
+                    </span>
+                    <span v-if="question.type === 0" style="color: #666; font-size: 0.9em">
+                        (单选题)
+                    </span>
+                    <span v-if="question.type === 1" style="color: #666; font-size: 0.9em">
                         (多选题)
                     </span>
+                    <span v-if="question.type === 2" style="color: #666; font-size: 0.9em">
+                        (简答题)
+                    </span>
                 </div>
 
-                <el-radio-group v-if="question.type === 'single'" v-model="userAnswers[index]">
+                <el-radio-group v-if="question.type === -1" v-model="userAnswers[index]">
+                    <el-radio v-for="(option, index) in question.optionArr" :key="index" :label="index + 1"
+                        class="option-item">
+                        <span style="margin-right: 8px; font-weight: bold;">
+                            {{ String.fromCharCode(65 + index) }}.
+                        </span>
+                        {{ option }}
+                    </el-radio>
+                </el-radio-group>
+
+                <el-radio-group v-if="question.type === 0" v-model="userAnswers[index]">
                     <el-radio v-for="(option, index) in question.optionArr" :key="index" :label="index + 1"
                         class="option-item">
                         <span style="margin-right: 8px; font-weight: bold;">
@@ -21,7 +40,8 @@
                         {{ option }}
                     </el-radio>
                 </el-radio-group>
-                <el-checkbox-group v-if="question.type === 'multiple'" v-model="userAnswers[index]">
+
+                <el-checkbox-group v-if="question.type === 1" v-model="userAnswers[index]">
                     <el-checkbox v-for="(option, index) in question.optionArr" :key="index" :value="index + 1">
                         <span style="margin-right: 8px; font-weight: bold;">
                             {{ String.fromCharCode(65 + index) }}.
@@ -29,6 +49,12 @@
                         {{ option }}
                     </el-checkbox>
                 </el-checkbox-group>
+
+                <div v-if="question.type === 2">
+                    <el-input v-model="userAnswers[index]" style="width: 540px" :rows="2" type="textarea"
+                        placeholder="输入答案" />
+                </div>
+
             </div>
             <el-button type="primary" @click="submitAnswers" class="submit-btn">
                 提交答案
@@ -38,7 +64,7 @@
 </template>
 <script setup>
 
-import { onMounted, reactive, ref, watch, toRaw } from 'vue';
+import { onMounted, reactive, ref, watch } from 'vue';
 import { HttpClient } from '@/network/HttpClient';
 import { useRoute } from 'vue-router';
 const questions = reactive([]);
@@ -61,8 +87,12 @@ const submitAnswers = () => {
     }
     userAnswersJson = JSON.stringify(userAnswers.map((answer, index) => ({
         question_id: questions[index].id,
-        answer: Array.isArray(answer) ? answer : [answer]
+        answer: Array.isArray(answer) ? answer : [answer],
+        type: questions[index].type
     })));
+    console.log(userAnswersJson);
+
+
     getCurrentTime();
     submitWrongQuestion()
 };
@@ -78,14 +108,13 @@ const gerWrongQuestion = async () => {
         res.data.data.forEach(question => {
             const mappedQuestion = {
                 id: question.question_id,
-                type: question.type === 0 ? 'single' : 'multiple',
+                type: question.type,
                 title: question.title,
                 optionArr: question.optionArr,
             };
 
             questions.push(mappedQuestion);
         });
-        console.log(questions);
 
     }).catch(err => {
         console.log(err)
@@ -100,11 +129,8 @@ const getCurrentTime = () => {
     const hours = String(now.getHours()).padStart(2, '0');
     const minutes = String(now.getMinutes()).padStart(2, '0');
     submitTime.value = `${year}-${month}-${day} ${hours}:${minutes}`;
-    console.log(submitTime.value)
 }
 const submitWrongQuestion = async () => {
-
-
     await HttpClient.post('submitWrongQuestion', {
         homework_id: homework_id.value,
         student_id: 1,
diff --git a/homework-3.9.sql b/homework-3.9.sql
new file mode 100644
index 0000000..50cb3e8
--- /dev/null
+++ b/homework-3.9.sql
@@ -0,0 +1,286 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : homeWork
+ Source Server Type    : MySQL
+ Source Server Version : 50742
+ Source Host           : 8.138.182.34:3306
+ Source Schema         : homework
+
+ Target Server Type    : MySQL
+ Target Server Version : 50742
+ File Encoding         : 65001
+
+ Date: 09/03/2025 21:06:55
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for Troubleshooting
+-- ----------------------------
+DROP TABLE IF EXISTS `Troubleshooting`;
+CREATE TABLE `Troubleshooting`  (
+  `troubleshooting_id` int(11) NOT NULL AUTO_INCREMENT,
+  `question_id` int(11) NOT NULL,
+  `homework_id` int(11) NOT NULL,
+  `submit_time` date NULL DEFAULT NULL,
+  `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `solveStatus` tinyint(1) NULL DEFAULT NULL,
+  `solveContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `solveTime` date NULL DEFAULT NULL,
+  `teacher_id` int(11) NOT NULL,
+  `student_id` int(11) NOT NULL,
+  PRIMARY KEY (`troubleshooting_id`) USING BTREE,
+  INDEX `homework_id`(`homework_id`) USING BTREE,
+  INDEX `student_id`(`student_id`) USING BTREE,
+  CONSTRAINT `Troubleshooting_ibfk_2` FOREIGN KEY (`homework_id`) REFERENCES `homework` (`homework_id`) ON DELETE CASCADE ON UPDATE RESTRICT,
+  CONSTRAINT `Troubleshooting_ibfk_3` FOREIGN KEY (`student_id`) REFERENCES `student` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `Troubleshooting_ibfk_4` FOREIGN KEY (`student_id`) REFERENCES `student` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of Troubleshooting
+-- ----------------------------
+INSERT INTO `Troubleshooting` VALUES (1, 1, 1, NULL, '好难啊，不想玩了', NULL, NULL, NULL, 1, 1);
+INSERT INTO `Troubleshooting` VALUES (2, 2, 2, NULL, '好难啊，不想玩了', NULL, NULL, NULL, 1, 2);
+INSERT INTO `Troubleshooting` VALUES (3, 3, 1, NULL, '好难啊，不想玩了1', NULL, NULL, NULL, 1, 1);
+INSERT INTO `Troubleshooting` VALUES (4, 4, 1, NULL, '不会做', NULL, NULL, NULL, 1, 1);
+INSERT INTO `Troubleshooting` VALUES (5, 5, 1, NULL, '2432', NULL, NULL, NULL, 1, 1);
+INSERT INTO `Troubleshooting` VALUES (11, 1, 1, NULL, 'test', NULL, NULL, NULL, 1, 1);
+INSERT INTO `Troubleshooting` VALUES (12, 1, 1, NULL, 'uu、', NULL, NULL, NULL, 1, 1);
+
+-- ----------------------------
+-- Table structure for homework
+-- ----------------------------
+DROP TABLE IF EXISTS `homework`;
+CREATE TABLE `homework`  (
+  `homework_id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` int(11) NOT NULL,
+  `homeworkDescribe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `startTime` datetime NOT NULL,
+  `finishTime` datetime NOT NULL,
+  `homework_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `course_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `teacher_id` int(11) NULL DEFAULT NULL,
+  `answer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `ungraded` int(200) NULL DEFAULT NULL,
+  `unsubmitted` int(200) NULL DEFAULT NULL,
+  `submit` int(200) NULL DEFAULT NULL,
+  PRIMARY KEY (`homework_id`) USING BTREE,
+  INDEX `teacher_id`(`teacher_id`) USING BTREE,
+  CONSTRAINT `homework_ibfk_2` FOREIGN KEY (`teacher_id`) REFERENCES `teacher` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of homework
+-- ----------------------------
+INSERT INTO `homework` VALUES (1, 1, '第一章', '2025-01-30 17:24:39', '2025-01-09 17:24:31', '第一章', '化学', 1, '10', 13, 22, 33);
+INSERT INTO `homework` VALUES (2, 1, '第二章', '2025-01-30 17:24:39', '2025-01-20 17:28:12', '第二章', '物理1', 1, '13', 12, 22, 33);
+INSERT INTO `homework` VALUES (3, 2, '第三章', '2025-01-15 10:22:00', '2025-02-05 17:15:02', '作业2', '物理', 1, '15', 11, 11, 11);
+INSERT INTO `homework` VALUES (4, 1, '第四章', '2025-02-12 17:15:20', '2025-02-11 17:15:52', '作业1', '化学1', 1, '33', 11, 23, 33);
+
+-- ----------------------------
+-- Table structure for homework_question
+-- ----------------------------
+DROP TABLE IF EXISTS `homework_question`;
+CREATE TABLE `homework_question`  (
+  `homework_id` int(11) NOT NULL COMMENT '作业id',
+  `question_id` int(11) NOT NULL COMMENT '题目id'
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of homework_question
+-- ----------------------------
+INSERT INTO `homework_question` VALUES (1, 3);
+INSERT INTO `homework_question` VALUES (1, 2);
+INSERT INTO `homework_question` VALUES (3, 3);
+INSERT INTO `homework_question` VALUES (1, 1);
+
+-- ----------------------------
+-- Table structure for homework_wrongquestion
+-- ----------------------------
+DROP TABLE IF EXISTS `homework_wrongquestion`;
+CREATE TABLE `homework_wrongquestion`  (
+  `homework_id` int(11) NOT NULL,
+  `question_id` int(11) NOT NULL COMMENT '错题题号',
+  `student_id` int(11) NOT NULL
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of homework_wrongquestion
+-- ----------------------------
+INSERT INTO `homework_wrongquestion` VALUES (1, 3, 1);
+INSERT INTO `homework_wrongquestion` VALUES (1, 2, 1);
+INSERT INTO `homework_wrongquestion` VALUES (1, 1, 1);
+
+-- ----------------------------
+-- Table structure for notice
+-- ----------------------------
+DROP TABLE IF EXISTS `notice`;
+CREATE TABLE `notice`  (
+  `student_id` int(11) NOT NULL COMMENT '学生id',
+  `content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息内容',
+  `type` int(11) NOT NULL COMMENT '类型（1为成功提交作业，2为作业即将截止，3为成功提交答疑，4为收到老师答复，5为作业已批改）',
+  `is_read` int(11) NOT NULL COMMENT '是否已读（0未读，1已读）',
+  `submit_time` datetime NOT NULL COMMENT '消息发送日期'
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of notice
+-- ----------------------------
+INSERT INTO `notice` VALUES (1, '已成功提交作业1', 1, 0, '2025-02-25 12:19:14');
+INSERT INTO `notice` VALUES (1, '已成功提交作业2', 1, 0, '2025-02-25 12:19:53');
+
+-- ----------------------------
+-- Table structure for question
+-- ----------------------------
+DROP TABLE IF EXISTS `question`;
+CREATE TABLE `question`  (
+  `question_id` int(11) NOT NULL COMMENT '题目id',
+  `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目',
+  `type` int(11) NOT NULL COMMENT '题目类型（暂定单选0，多选1，简答题2）',
+  `correct_answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '答案（暂定使用字符串拼接来作为选择题答案）',
+  PRIMARY KEY (`question_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of question
+-- ----------------------------
+INSERT INTO `question` VALUES (1, 'Vue3 的 Composition API 中，用于响应式数据的方法是？', 0, 'D');
+INSERT INTO `question` VALUES (2, '下列哪些属于 Element Plus 的组件？', 1, 'A,B,C,D');
+INSERT INTO `question` VALUES (3, '简答什么是控制反转', 2, 'D');
+
+-- ----------------------------
+-- Table structure for question_option
+-- ----------------------------
+DROP TABLE IF EXISTS `question_option`;
+CREATE TABLE `question_option`  (
+  `option_num` int(11) NULL DEFAULT NULL COMMENT '选项的序号',
+  `option_value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `question_id` int(11) NULL DEFAULT NULL
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of question_option
+-- ----------------------------
+INSERT INTO `question_option` VALUES (1, 'ref', 1);
+INSERT INTO `question_option` VALUES (2, 'reactive', 1);
+INSERT INTO `question_option` VALUES (3, 'both', 1);
+INSERT INTO `question_option` VALUES (1, 'aa', 2);
+INSERT INTO `question_option` VALUES (2, 'bb', 2);
+INSERT INTO `question_option` VALUES (3, 'cc', 2);
+
+-- ----------------------------
+-- Table structure for student
+-- ----------------------------
+DROP TABLE IF EXISTS `student`;
+CREATE TABLE `student`  (
+  `id` int(11) NOT NULL,
+  `sno` varchar(13) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of student
+-- ----------------------------
+INSERT INTO `student` VALUES (1, '1111', '张三', '123456', '12345678901');
+INSERT INTO `student` VALUES (2, '2222', '老四', '123456', '12345678909');
+
+-- ----------------------------
+-- Table structure for submit
+-- ----------------------------
+DROP TABLE IF EXISTS `submit`;
+CREATE TABLE `submit`  (
+  `submit_id` int(11) NOT NULL AUTO_INCREMENT,
+  `homework_id` int(11) NULL DEFAULT NULL,
+  `submitTime` datetime NOT NULL,
+  `submitStatus` tinyint(1) NOT NULL,
+  `correct` tinyint(1) NULL DEFAULT NULL,
+  `score` double NULL DEFAULT NULL,
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `answer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '答案',
+  `student_id` int(11) NULL DEFAULT NULL,
+  `teacher_id` int(11) NULL DEFAULT NULL,
+  `type` int(11) NULL DEFAULT NULL COMMENT '题目类型',
+  PRIMARY KEY (`submit_id`) USING BTREE,
+  INDEX `homework_id`(`homework_id`) USING BTREE,
+  INDEX `student_id`(`student_id`) USING BTREE,
+  INDEX `teacher_id`(`teacher_id`) USING BTREE,
+  CONSTRAINT `submit_ibfk_1` FOREIGN KEY (`homework_id`) REFERENCES `homework` (`homework_id`) ON DELETE SET NULL ON UPDATE RESTRICT,
+  CONSTRAINT `submit_ibfk_2` FOREIGN KEY (`student_id`) REFERENCES `student` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `submit_ibfk_3` FOREIGN KEY (`teacher_id`) REFERENCES `teacher` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of submit
+-- ----------------------------
+INSERT INTO `submit` VALUES (1, 1, '2025-03-09 17:44:00', 1, 0, 90, NULL, '[{\"question_id\":2,\"answer\":[2,3]},{\"question_id\":3,\"answer\":[2]}]', 1, 1, NULL);
+
+-- ----------------------------
+-- Table structure for teacher
+-- ----------------------------
+DROP TABLE IF EXISTS `teacher`;
+CREATE TABLE `teacher`  (
+  `id` int(11) NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of teacher
+-- ----------------------------
+INSERT INTO `teacher` VALUES (1, '黎明', '123456', '12345432123');
+
+-- ----------------------------
+-- Table structure for user
+-- ----------------------------
+DROP TABLE IF EXISTS `user`;
+CREATE TABLE `user`  (
+  `user_id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `user_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  PRIMARY KEY (`user_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of user
+-- ----------------------------
+INSERT INTO `user` VALUES (1, '1', '1', '1', '1');
+INSERT INTO `user` VALUES (2, '李明', '2', '2', '2');
+
+-- ----------------------------
+-- Table structure for wrongquestionsubmit
+-- ----------------------------
+DROP TABLE IF EXISTS `wrongquestionsubmit`;
+CREATE TABLE `wrongquestionsubmit`  (
+  `wrong_id` int(11) NOT NULL AUTO_INCREMENT,
+  `homework_id` int(11) NOT NULL,
+  `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `answer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `addTime` datetime NOT NULL,
+  `student_id` int(11) NOT NULL,
+  `reviewStatus` tinyint(11) NOT NULL,
+  `submitTime` datetime NULL DEFAULT NULL,
+  `teacher_id` int(11) NULL DEFAULT NULL,
+  PRIMARY KEY (`wrong_id`) USING BTREE,
+  INDEX `homework_id`(`homework_id`) USING BTREE,
+  INDEX `student_id`(`student_id`) USING BTREE,
+  CONSTRAINT `wrongquestionsubmit_ibfk_2` FOREIGN KEY (`homework_id`) REFERENCES `homework` (`homework_id`) ON DELETE CASCADE ON UPDATE RESTRICT,
+  CONSTRAINT `wrongquestionsubmit_ibfk_3` FOREIGN KEY (`student_id`) REFERENCES `student` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of wrongquestionsubmit
+-- ----------------------------
+INSERT INTO `wrongquestionsubmit` VALUES (1, 1, '11111', '[{\"question_id\":2,\"answer\":[2,3,1]},{\"question_id\":3,\"answer\":[3]}]', '2025-02-25 15:31:00', 1, 1, '2025-03-09 17:44:00', 1);
+
+SET FOREIGN_KEY_CHECKS = 1;
-- 
Gitee


From 64ee8f96f65dd79b3e383a9f38549b5f265fe4cf Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Mon, 10 Mar 2025 00:12:17 +0800
Subject: [PATCH 2/2] 3.10

---
 .../template/constant/ResultCode.java         |  1 +
 .../template/dao/impl/QuestionDaoImpl.java    | 24 ++++----
 .../dao/impl/WrongQuestionDaoImpl.java        | 41 ++++++-------
 .../MultipleChoiceQuestions.vue               | 57 +++++++++++++++----
 4 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java b/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java
index 8b07015..c837150 100644
--- a/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java
+++ b/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java
@@ -5,6 +5,7 @@ public enum ResultCode {
     SUCCESS(200, "请求成功"),
     ERROR(400, "请求出错");
 
+
     private int code;
     private String msg;
     ResultCode(int code, String msg){
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java
index 7bb03bf..d8baf28 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java
@@ -13,18 +13,18 @@ public class QuestionDaoImpl implements QuestionDao {
     @Override
     public ArrayList<Question> getQuestion(Connection connection, int homework_id) throws Exception {
         ArrayList<Question> questions = new ArrayList<>();
-        String sql ="SELECT\n" +
-                "\tq.title,\n" +
-                "\tq.question_id,\n" +
-                "\tq.type,\n" +
-                "\tJSON_ARRAYAGG( qo.option_value ) AS optionStr \n" +
-                "FROM\n" +
-                "\tquestion q\n" +
-                "\tINNER JOIN question_option qo ON q.question_id = qo.question_id \n" +
-                "WHERE\n" +
-                "\tq.question_id IN ( SELECT hq.question_id FROM homework_question hq WHERE hq.homework_id = ? ) \n" +
-                "GROUP BY\n" +
-                "\tq.question_id;";
+        String sql = "SELECT q.title, " +
+                "q.question_id, " +
+                "q.type, " +
+                "JSON_ARRAYAGG(qo.option_value) AS optionStr " +
+                "FROM question q " +
+                "LEFT JOIN question_option qo " +
+                "ON q.question_id = qo.question_id " +
+                "WHERE q.question_id IN ( " +
+                "SELECT hq.question_id " +
+                "FROM homework_question hq " +
+                "WHERE hq.homework_id = ? ) " +
+                "GROUP BY q.question_id;";
         try (PreparedStatement pstm = connection.prepareStatement(sql)) {
             pstm.setInt(1, homework_id);
             try (ResultSet rs = pstm.executeQuery()) {
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
index 8b8dae7..fa63991 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java
@@ -50,26 +50,27 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao {
     @Override
     public List<Question> getWrongQuestion(Connection connection, int homework_id , int student_id) throws Exception {
         ArrayList<Question> questions = new ArrayList<>();
-        String sql = "SELECT\n" +
-                "\tq.title,\n" +
-                "\tq.question_id,\n" +
-                "\tq.type,\n" +
-                "\tJSON_ARRAYAGG(qo.option_value) AS optionStr\n" +
-                "FROM\n" +
-                "\tquestion q\n" +
-                "\tLEFT JOIN question_option qo ON q.question_id = qo.question_id \n" +
-                "WHERE\n" +
-                "\tq.question_id IN (\n" +
-                "\tSELECT\n" +
-                "\t\thwq.question_id \n" +
-                "\tFROM\n" +
-                "\t\thomework_wrongquestion hwq \n" +
-                "\tWHERE\n" +
-                "\t\thomework_id = ? AND\n" +
-                "\t\tstudent_id = ? \n" +
-                "\t)\n" +
-                "GROUP BY\n" +
-                "     q.question_id;";
+
+        String sql = "SELECT " +
+                "q.title, " +
+                "q.question_id, " +
+                "q.type, " +
+                "JSON_ARRAYAGG(CAST(qo.option_value AS CHAR CHARACTER SET utf8mb4)) AS optionStr " +
+                "FROM " +
+                "question q " +
+                "LEFT JOIN question_option qo ON q.question_id = qo.question_id " +
+                "WHERE " +
+                "q.question_id IN ( " +
+                "SELECT " +
+                "hwq.question_id " +
+                "FROM " +
+                "homework_wrongquestion hwq " +
+                "WHERE " +
+                "homework_id = ? AND " +
+                "student_id = ? " +
+                ") " +
+                "GROUP BY " +
+                "q.question_id;";
         try (PreparedStatement pstm = connection.prepareStatement(sql)) {
             pstm.setInt(1, homework_id);
             pstm.setInt(2, student_id);
diff --git a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
index fc5ce82..926e38c 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
@@ -12,13 +12,22 @@
                 <!-- 题目 -->
                 <div class="question-title">
                     {{ index + 1 }}. {{ question.title }}
-                    <span v-if="question.type === 'multiple'" style="color: #666; font-size: 0.9em">
+                    <span v-if="question.type === -1" style="color: #666; font-size: 0.9em">
+                        (判断题)
+                    </span>
+                    <span v-if="question.type === 0" style="color: #666; font-size: 0.9em">
+                        (单选题)
+                    </span>
+                    <span v-if="question.type === 1" style="color: #666; font-size: 0.9em">
                         (多选题)
                     </span>
+                    <span v-if="question.type === 2" style="color: #666; font-size: 0.9em">
+                        (简答题)
+                    </span>
                 </div>
 
                 <!-- 单选题选项 -->
-                <el-radio-group v-if="question.type === 'single'" v-model="userAnswers[index]">
+                <el-radio-group v-if="question.type === 0" v-model="userAnswers[index]">
                     <el-radio v-for="(option, index) in question.optionArr" :key="index" :label="index + 1">
                         <span style="margin-right: 8px; font-weight: bold;">
                             {{ String.fromCharCode(65 + index) }}.
@@ -28,7 +37,7 @@
                 </el-radio-group>
 
                 <!-- 多选题选项 -->
-                <el-checkbox-group v-if="question.type === 'multiple'" v-model="userAnswers[index]">
+                <el-checkbox-group v-if="question.type === 1" v-model="userAnswers[index]">
                     <el-checkbox v-for="(option, index) in question.optionArr" :key="index" :value="index + 1">
                         <span style="margin-right: 8px; font-weight: bold;">
                             {{ String.fromCharCode(65 + index) }}.
@@ -37,6 +46,21 @@
                     </el-checkbox>
                 </el-checkbox-group>
 
+
+                <el-radio-group v-if="question.type === -1" v-model="userAnswers[index]">
+                    <el-radio v-for="(option, index) in question.optionArr" :key="index" :label="index + 1"
+                        class="option-item">
+                        <span style="margin-right: 8px; font-weight: bold;">
+                            {{ String.fromCharCode(65 + index) }}.
+                        </span>
+                        {{ option }}
+                    </el-radio>
+                </el-radio-group>
+
+                <div v-if="question.type === 2">
+                    <el-input v-model="userAnswers[index]" style="width:70%" class="el-input" :rows="4" type="textarea"
+                        placeholder="输入答案" />
+                </div>
             </div>
 
             <el-button type="primary" @click="submitAnswers" class="submit-btn">
@@ -91,7 +115,7 @@ const getQuestion = async () => {
         res.data.data.forEach(question => {
             const mappedQuestion = {
                 id: question.question_id,
-                type: question.type === 0 ? 'single' : 'multiple',
+                type: question.type,
                 title: question.title,
                 optionArr: question.optionArr,
             };
@@ -139,9 +163,11 @@ watch(() => {
     margin-right: auto;
 }
 
-.el-card{
+.el-card {
     width: 100%;
     height: 100%;
+    overflow-y: scroll;
+
 }
 
 .record {
@@ -179,12 +205,21 @@ watch(() => {
     margin-top: 20px;
 }
 
-.el-radio-group, .el-checkbox-group {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: 12px;
-  margin-left: 40px;
+.el-input {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 12px;
+    margin-left: 40px;
+}
+
+.el-radio-group,
+.el-checkbox-group {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 12px;
+    margin-left: 40px;
 }
 
 :deep(.el-radio__label),
-- 
Gitee