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 |   62 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
index 3894850..121bbcc 100644
--- a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
+++ b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
@@ -1,9 +1,15 @@
 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.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
+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.domain.vo.QuestionSubjectVO;
 import lombok.Data;
+import org.springframework.util.StringUtils;
+
 import java.util.List;
 
 /**
@@ -12,30 +18,50 @@
  */
 @Data
 @ColumnWidth(20)
+@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)//鍐呭鏍峰紡
 public class QuestionImportVO {
 
     @ExcelProperty("棰樼洰绫诲瀷")
-    private Integer questionType;
+    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;
+
     // 閫夐」鍐呭
-    @ColumnWidth(60)
-    @ExcelProperty("閫夐」鍜岀瓟妗�")
-    private List<QuestionEditItemVM> items;
+    @ExcelProperty("閫夐」A")
+    private String optionA;
+
+    @ExcelProperty("閫夐」B")
+    private String optionB;
+
+    @ExcelProperty("閫夐」C")
+    private String optionC;
+
+    @ExcelProperty("閫夐」D")
+    private String optionD;
+
+    @ExcelProperty("绛旀(澶氫釜鐢�,闅斿紑)")
+    private String correct;
 
     // 瑙ｆ瀽
     @ColumnWidth(30)
     @ExcelProperty("瑙ｆ瀽")
     private String analyze;
-
-    @ExcelProperty("绛旀")
-    private String correct;
 
     // 棰樼洰鍒嗘暟
     @ExcelProperty("棰樼洰鍒嗘暟")
@@ -45,16 +71,12 @@
     @ExcelProperty("棰樼洰闅惧害")
     private Integer difficult;
 
-    @ExcelProperty("閫夐」A")
-    private String a;
-
-    @ExcelProperty("閫夐」B")
-    private String b;
-
-    @ExcelProperty("閫夐」C")
-    private String c;
-
-    @ExcelProperty("閫夐」D")
-    private String d;
+    /**
+     * 杩斿洖璇ユ潯鏁版嵁鏄笉鏄锛屽洜涓鸿繕鏈夐�夐」銆傞�夐」鐨勮繖浜涘�兼槸绌虹殑
+     * @return
+     */
+    public boolean master() {
+        return StringUtils.hasText(questionType) && StringUtils.hasText(subjectName) && StringUtils.hasText(title);
+    }
 
 }

--
Gitblit v1.8.0