From d69a9a79a82c8a2f93efcd2b43b0a03ca57a031c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 08 七月 2024 17:37:19 +0800
Subject: [PATCH] 课目重构
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
index ef605d1..9d623ea 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -1,55 +1,45 @@
package com.mindskip.xzs.controller.admin;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.enums.CellExtraTypeEnum;
-import com.alibaba.excel.metadata.data.HyperlinkData;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.base.SystemCode;
-import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.Question;
-import com.mindskip.xzs.domain.QuestionSubject;
import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.domain.TextContent;
import com.mindskip.xzs.domain.enums.QuestionSourceEnum;
-import com.mindskip.xzs.domain.enums.QuestionStatusEnum;
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.domain.vo.DeptQuestionVO;
-import com.mindskip.xzs.excel.*;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.DeptQuestionMapper;
import com.mindskip.xzs.repository.SubjectMapper;
-import com.mindskip.xzs.service.*;
+import com.mindskip.xzs.service.QuestionService;
+import com.mindskip.xzs.service.QuestionSubjectService;
+import com.mindskip.xzs.service.TextContentService;
import com.mindskip.xzs.utility.*;
import com.mindskip.xzs.utility.convert.QuestionClassConvert;
import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
import com.mindskip.xzs.viewmodel.admin.question.*;
-import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.vo.QuestionExportData;
import com.mindskip.xzs.vo.QuestionExportVO;
import com.mindskip.xzs.vo.QuestionImportVO;
import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.util.*;
-import java.util.function.Consumer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController("AdminQuestionController")
@@ -160,11 +150,6 @@
// 鏋勫缓妯℃澘鏍蜂緥鏁版嵁
List<QuestionImportVO> data = new ArrayList<>(4);
-
- // 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
- List<Subject> subjects = subjectMapper.allSubject(new ArrayList<>(), Boolean.TRUE);
- List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
-
EasyExcel.write(response.getOutputStream(), QuestionExportData.class)
.sheet("妯℃澘")
.doWrite(data);
@@ -388,7 +373,11 @@
}
vm.setItems(questionEditItemVMS);
// 娓呯┖鍓嶅悗鐨勯�楀彿锛屼互鍏嶅悗缁綔绛斿垽鏂负閿欒
- List<String> str = Arrays.asList(vm.getCorrect().replaceAll("^,+|,+$", "").split(SPLIT));
+ String s = vm.getCorrect().replaceAll("^,+|,+$", "");
+ if (Objects.equals(s, "姝ｇ‘")) s = "A";
+ if (Objects.equals(s, "閿欒")) s = "B";
+ vm.setCorrect(s);
+ List<String> str = Arrays.asList(s.split(SPLIT));
List<Subject> subjectList = subjectMapper.getNames(vm.getSbNames().split(SPLIT));
--
Gitblit v1.8.0