|
@@ -2,12 +2,15 @@ package cn.com.qmth.mps.service.impl;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.Comparator;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import cn.com.qmth.mps.bean.*;
|
|
|
-import cn.com.qmth.mps.enums.ArbitrateMethod;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -18,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -29,18 +33,36 @@ import com.qmth.boot.tools.excel.ExcelReader;
|
|
|
import com.qmth.boot.tools.excel.enums.ExcelType;
|
|
|
import com.qmth.boot.tools.excel.model.DataMap;
|
|
|
|
|
|
+import cn.com.qmth.mps.bean.DefaultDoubleSet;
|
|
|
+import cn.com.qmth.mps.bean.DoubleMarkImportParam;
|
|
|
+import cn.com.qmth.mps.bean.PaperDetail;
|
|
|
+import cn.com.qmth.mps.bean.PaperDetailUnit;
|
|
|
+import cn.com.qmth.mps.bean.PaperGroupUnit;
|
|
|
+import cn.com.qmth.mps.bean.User;
|
|
|
import cn.com.qmth.mps.dao.PaperDao;
|
|
|
import cn.com.qmth.mps.entity.CourseEntity;
|
|
|
import cn.com.qmth.mps.entity.ExamEntity;
|
|
|
import cn.com.qmth.mps.entity.PaperEntity;
|
|
|
+import cn.com.qmth.mps.enums.ArbitrateMethod;
|
|
|
import cn.com.qmth.mps.enums.ExamStatus;
|
|
|
import cn.com.qmth.mps.enums.Role;
|
|
|
-import cn.com.qmth.mps.service.*;
|
|
|
+import cn.com.qmth.mps.exception.DisruptedException;
|
|
|
+import cn.com.qmth.mps.service.CourseService;
|
|
|
+import cn.com.qmth.mps.service.ExamService;
|
|
|
+import cn.com.qmth.mps.service.PaperDetailService;
|
|
|
+import cn.com.qmth.mps.service.PaperGroupService;
|
|
|
+import cn.com.qmth.mps.service.PaperService;
|
|
|
import cn.com.qmth.mps.util.BatchSetDataUtil;
|
|
|
import cn.com.qmth.mps.util.Calculator;
|
|
|
import cn.com.qmth.mps.util.PageUtil;
|
|
|
import cn.com.qmth.mps.vo.exam.ExamPaperCountVo;
|
|
|
-import cn.com.qmth.mps.vo.paper.*;
|
|
|
+import cn.com.qmth.mps.vo.paper.GroupCountVo;
|
|
|
+import cn.com.qmth.mps.vo.paper.PaperGroupDomain;
|
|
|
+import cn.com.qmth.mps.vo.paper.PaperInfoVo;
|
|
|
+import cn.com.qmth.mps.vo.paper.PaperQuery;
|
|
|
+import cn.com.qmth.mps.vo.paper.PaperStructInfoVo;
|
|
|
+import cn.com.qmth.mps.vo.paper.PaperVo;
|
|
|
+import cn.com.qmth.mps.vo.paper.StructDomain;
|
|
|
|
|
|
@Service
|
|
|
public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> implements PaperService {
|
|
@@ -622,6 +644,9 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
|
|
|
paperDetailService.structImport(domain, user);
|
|
|
} catch (StatusException e) {
|
|
|
failRecords.add("科目:" + map.get(domain.getPaperId()) + " " + e.getMessage());
|
|
|
+ } catch (DisruptedException e) {
|
|
|
+ failRecords.add("科目:" + map.get(domain.getPaperId()) + " " + e.getMessage());
|
|
|
+ return;
|
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException("系统错误", e);
|
|
|
}
|