caozixuan 4 năm trước cách đây
mục cha
commit
1e0bf650ea

+ 0 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -12,7 +12,6 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
@@ -34,7 +33,6 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
 
     public static final String OBJ_TITLE = "考务数据";
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public Result importTask(Map<String, Object> map) throws Exception {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);

+ 13 - 13
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -505,19 +505,19 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         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);
-        }
+//        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);
+//        }
         map.put("dataCount",dataList.size());
         return map;
     }