From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug:学员有状态不能修改问题

---
 src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
index b61ec5f..121bbcc 100644
--- a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
+++ b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
@@ -1,14 +1,13 @@
 package com.mindskip.xzs.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
-import io.swagger.models.auth.In;
+import com.mindskip.xzs.domain.vo.QuestionSubjectVO;
 import lombok.Data;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
@@ -25,21 +24,38 @@
     @ExcelProperty("棰樼洰绫诲瀷")
     private String questionType;
 
-    @ExcelProperty("璇剧洰(澶氫釜鐢ㄣ�侀殧寮�)")
+    @ExcelProperty("璇剧洰(澶氫釜鐢�,闅斿紑)")
     private String subjectName;
+
+    @ExcelIgnore
+    private List<Integer> subjectIds;
+    @ExcelIgnore
+    private List<String> subjectList;
 
     @ColumnWidth(80)
     @ExcelProperty("棰樺共")
     private String title;
 
+    /***
+     * 棰樼洰鍐呭
+     */
+    @ExcelIgnore
+    private String questionContent;
+
     // 閫夐」鍐呭
-    @ExcelProperty({"棰樼洰閫夐」", "閫夐」"})
-    private String optionName;
+    @ExcelProperty("閫夐」A")
+    private String optionA;
 
-    @ExcelProperty({"棰樼洰閫夐」", "閫夐」鍊�"})
-    private String optionValue;
+    @ExcelProperty("閫夐」B")
+    private String optionB;
 
-    @ExcelProperty("绛旀(澶氫釜鐢ㄣ�侀殧寮�)")
+    @ExcelProperty("閫夐」C")
+    private String optionC;
+
+    @ExcelProperty("閫夐」D")
+    private String optionD;
+
+    @ExcelProperty("绛旀(澶氫釜鐢�,闅斿紑)")
     private String correct;
 
     // 瑙f瀽
@@ -47,10 +63,9 @@
     @ExcelProperty("瑙f瀽")
     private String analyze;
 
-
     // 棰樼洰鍒嗘暟
     @ExcelProperty("棰樼洰鍒嗘暟")
-    private Integer score;
+    private String score;
 
     // 棰樼洰闅惧害
     @ExcelProperty("棰樼洰闅惧害")

--
Gitblit v1.8.0