|
@@ -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();
|
|
|
}
|