From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 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..4c6035e 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,49 +18,59 @@
*/
@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({"棰樼洰閫夐」", "閫夐」"})
+ private String optionName;
+
+ @ExcelProperty({"棰樼洰閫夐」", "閫夐」鍊�"})
+ private String optionValue;
+
+ @ExcelProperty("绛旀(澶氫釜鐢ㄣ�侀殧寮�)")
+ private String correct;
// 瑙ｆ瀽
@ColumnWidth(30)
@ExcelProperty("瑙ｆ瀽")
private String analyze;
- @ExcelProperty("绛旀")
- private String correct;
-
// 棰樼洰鍒嗘暟
@ExcelProperty("棰樼洰鍒嗘暟")
- private String score;
+ private Integer score;
// 棰樼洰闅惧害
@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