|
@@ -1,10 +1,8 @@
|
|
package com.qmth.distributed.print.business.templete.service.impl;
|
|
package com.qmth.distributed.print.business.templete.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.io.IoUtil;
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
-import com.aliyun.oss.common.utils.BinaryUtil;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
import com.itextpdf.text.DocumentException;
|
|
import com.itextpdf.text.DocumentException;
|
|
@@ -14,11 +12,7 @@ import com.qmth.distributed.print.business.bean.dto.FieldsDto;
|
|
import com.qmth.distributed.print.business.bean.dto.excel.UserImportDto;
|
|
import com.qmth.distributed.print.business.bean.dto.excel.UserImportDto;
|
|
import com.qmth.distributed.print.business.bean.result.ExaminationResult;
|
|
import com.qmth.distributed.print.business.bean.result.ExaminationResult;
|
|
import com.qmth.distributed.print.business.entity.*;
|
|
import com.qmth.distributed.print.business.entity.*;
|
|
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
|
|
|
|
-import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
|
|
|
|
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
|
|
|
|
-import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
|
|
|
|
-import com.qmth.distributed.print.business.enums.UploadFileEnum;
|
|
|
|
|
|
+import com.qmth.distributed.print.business.enums.*;
|
|
import com.qmth.distributed.print.business.service.*;
|
|
import com.qmth.distributed.print.business.service.*;
|
|
import com.qmth.distributed.print.business.templete.service.TaskLogicService;
|
|
import com.qmth.distributed.print.business.templete.service.TaskLogicService;
|
|
import com.qmth.distributed.print.business.util.*;
|
|
import com.qmth.distributed.print.business.util.*;
|
|
@@ -26,7 +20,6 @@ import com.qmth.distributed.print.business.util.excel.ExcelError;
|
|
import com.qmth.distributed.print.common.contant.SystemConstant;
|
|
import com.qmth.distributed.print.common.contant.SystemConstant;
|
|
import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
|
|
import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
|
|
import com.qmth.distributed.print.common.util.Base64Util;
|
|
import com.qmth.distributed.print.common.util.Base64Util;
|
|
-import com.qmth.distributed.print.common.util.HexUtils;
|
|
|
|
import com.qmth.distributed.print.common.util.ResultUtil;
|
|
import com.qmth.distributed.print.common.util.ResultUtil;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
@@ -46,6 +39,7 @@ import java.io.*;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description: 任务处理逻辑impl
|
|
* @Description: 任务处理逻辑impl
|
|
@@ -568,6 +562,21 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
examDetailService.disposeExamDetailCourseByExaminationExcel(dataList, userId);
|
|
examDetailService.disposeExamDetailCourseByExaminationExcel(dataList, userId);
|
|
// 组装exam_student数据
|
|
// 组装exam_student数据
|
|
examDetailService.disposeExamStudentByExaminationExcel(dataList, userId);
|
|
examDetailService.disposeExamStudentByExaminationExcel(dataList, userId);
|
|
|
|
+
|
|
|
|
+ // TODO: 2021/4/13 调用检验接口 dataList按照schoolId,courseCode,paperNumber归集
|
|
|
|
+ List<Map<String, Object>> checkList = dataList.stream().flatMap(e -> {
|
|
|
|
+ Map<String, Object> tmp = new HashMap<>();
|
|
|
|
+ tmp.put("schoolId", e.get("schoolId"));
|
|
|
|
+ tmp.put("courseCode", e.get("courseCode"));
|
|
|
|
+ tmp.put("paperNumber", e.get("paperNumber"));
|
|
|
|
+ return Stream.of(tmp);
|
|
|
|
+ }).distinct().collect(Collectors.toList());
|
|
|
|
+ for (Map<String, Object> stringObjectMap : checkList) {
|
|
|
|
+ Long checkSchoolId = SystemConstant.convertIdToLong(String.valueOf(stringObjectMap.get("schoolId")));
|
|
|
|
+ String checkCourseCode = String.valueOf(stringObjectMap.get("courseCode"));
|
|
|
|
+ String checkPaperNumber = String.valueOf(stringObjectMap.get("paperNumber"));
|
|
|
|
+ commonService.checkData(checkSchoolId,checkCourseCode,checkPaperNumber);
|
|
|
|
+ }
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
|