fixbug

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java

@@ -1,11 +1,17 @@
 package com.qmth.themis.business.templete.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.google.gson.Gson;
 import com.qmth.themis.business.annotation.ExcelNotExport;
 import com.qmth.themis.business.annotation.ExcelNote;
+import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.MarkResultSimpleExportDto;
+import com.qmth.themis.business.dto.response.MarkResultDto;
+import com.qmth.themis.business.entity.TOeExamRecord;
+import com.qmth.themis.business.service.TEExamService;
 import com.qmth.themis.business.service.TEExamStudentService;
+import com.qmth.themis.business.service.TOeExamRecordService;
 import com.qmth.themis.business.templete.TaskExportCommon;
 import com.qmth.themis.business.templete.TaskExportTemplete;
 import com.qmth.themis.business.templete.service.TempleteLogicService;
@@ -43,6 +49,12 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
     @Resource
     TempleteLogicService templeteLogicService;
 
+    @Resource
+    TEExamService teExamService;
+
+    @Resource
+    TOeExamRecordService tOeExamRecordService;
+
     /**
      * 考场导出模版
      *
@@ -68,7 +80,22 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
             String identity = (String) map.get("identity");
             String name = (String) map.get("name");
             String courseCode = (String) map.get("courseCode");
+            Gson gson = new Gson();
             List<MarkResultSimpleExportDto> markResultSimpleExportDtoList = teExamStudentService.markResultQueryExport(examId, activityId, identity, name, courseCode);
+            if (Objects.nonNull(markResultSimpleExportDtoList) && markResultSimpleExportDtoList.size() > 0) {
+                for (MarkResultSimpleExportDto markResultSimpleExportDto : markResultSimpleExportDtoList) {
+                    MarkResultDto markResultDto = gson.fromJson(gson.toJson(markResultSimpleExportDto), MarkResultDto.class);
+                    if (Objects.nonNull(markResultDto.getExamId())) {
+                        ExamCacheBean examCacheBean = teExamService.getExamCacheBean(markResultDto.getExamId());
+                        TOeExamRecord tOeExamRecord = tOeExamRecordService.findMarkResult(markResultDto, examCacheBean.getRecordSelectStrategy());
+                        if (Objects.nonNull(tOeExamRecord)) {
+                            markResultSimpleExportDto.setObjectiveScore(Objects.isNull(tOeExamRecord.getObjectiveScore()) ? "0" : String.valueOf(tOeExamRecord.getObjectiveScore()));
+                            markResultSimpleExportDto.setRecordId(tOeExamRecord.getId());
+                            markResultSimpleExportDto.setPaperId(tOeExamRecord.getPaperId());
+                        }
+                    }
+                }
+            }
             boolean oss = (boolean) taskExportCommon.getOssEnv().get(SystemConstant.OSS);
             StringJoiner stringJoiner = new StringJoiner("");
             if (!oss) {

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java

@@ -49,7 +49,6 @@ import java.util.*;
 public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete {
     private final static Logger log = LoggerFactory.getLogger(TaskMarkResultStandardExportTemplete.class);
 
-
     @Resource
     TEExamStudentService teExamStudentService;