Selaa lähdekoodia

fix 题库导入

he2802 3 vuotta sitten
vanhempi
commit
d43060e80f

+ 11 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -2,9 +2,11 @@ package com.zhongzheng.controller.bank;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.http.HttpStatus;
 import com.github.pagehelper.PageInfo;
@@ -18,11 +20,13 @@ import com.zhongzheng.modules.bank.bo.QuestionAddBo;
 import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionEditBo;
 import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
+import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.bank.domain.Question;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
 import com.zhongzheng.modules.bank.service.IQuestionService;
 import com.zhongzheng.modules.bank.vo.QuestionBusinessVo;
+import com.zhongzheng.modules.bank.vo.QuestionExport;
 import com.zhongzheng.modules.bank.vo.QuestionImport;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -158,8 +162,14 @@ public class QuestionController extends BaseController {
         String operName = loginUser.getUsername();
         List<QuestionImport> errorList = iQuestionService.importQuestion(questionList, updateSupport, operName);
         if(Validator.isNotEmpty(errorList)&&errorList.size()>0){
+            List<QuestionExport> errorListExport = new ArrayList<>();
+            for(QuestionImport qi : errorList){
+                QuestionExport item = BeanUtil.toBean(qi, QuestionExport.class);
+                errorListExport.add(item);
+            }
+            ExcelUtil<QuestionExport> util1 = new ExcelUtil<QuestionExport>(QuestionExport.class);
             String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            return util.exportEasyExcel(util.exportEasyData(errorList), "导出错误数据"+timeStr);
+            return util.exportEasyExcel(util1.exportEasyData(errorListExport), "导出错误数据"+timeStr);
         }else{
             return AjaxResult.success();
         }

+ 82 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionExport.java

@@ -0,0 +1,82 @@
+package com.zhongzheng.modules.bank.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 题库题目添加对象 question
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class QuestionExport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "编号")
+    private String id;
+    /** 题目正文 */
+    @Excel(name = "题目内容")
+    private String content;
+
+    @Excel(name = "题目类型")
+    private String type;
+
+    @Excel(name = "正确答案")
+    private String answerQuestion;
+
+
+    @Excel(name = "答案解析")
+    private String analysisContent;
+    /** 问题内容 */
+    @Excel(name = "问题内容")
+    @ApiModelProperty("问题内容")
+    private String jsonStr;
+    /** 前缀名称 */
+    @Excel(name = "标题前缀")
+    private String prefixName;
+
+    /** 教育类型ID */
+    @Excel(name = "教育类型")
+    private String educationType;
+    /** 业务层次id */
+    @Excel(name = "业务层次")
+    private String business;
+    /** 科目id */
+    @Excel(name = "科目")
+    private String subject;
+    /** 项目ID */
+    @Excel(name = "项目类型")
+    private String project;
+
+    @Excel(name = "知识点")
+    private String knowledge;
+
+    private List<String> knowledgeList;
+
+    @Excel(name = "选项1")
+    private String v1;
+    @Excel(name = "选项2")
+    private String v2;
+    @Excel(name = "选项3")
+    private String v3;
+    @Excel(name = "选项4")
+    private String v4;
+    @Excel(name = "选项5")
+    private String v5;
+    @Excel(name = "选项6")
+    private String v6;
+    @Excel(name = "失败原因")
+    private String cause;
+
+}