Przeglądaj źródła

导入导出bugfix

wangliang 4 lat temu
rodzic
commit
e1028211c0

+ 0 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -198,7 +198,6 @@ public class TaskExportCommon {
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr + "错误信息:[" + e.getMessage() + "]");
         this.tbTaskHistory.setSummary(exceptionStr);
         this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
-        tbTaskHistoryService.updateById(this.tbTaskHistory);
         return txtList;
     }
 

+ 0 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -169,7 +169,6 @@ public class TaskImportCommon {
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr + "错误信息:[" + e.getMessage() + "]");
         this.tbTaskHistory.setSummary(exceptionStr);
         this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
-        tbTaskHistoryService.updateById(this.tbTaskHistory);
         return txtList;
     }
 

+ 2 - 5
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -53,9 +53,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
     @Resource
     TEExamCourseService teExamCourseService;
 
-    @Resource
-    TBTaskHistoryService tbTaskHistoryService;
-
     /**
      * 考生导入逻辑
      *
@@ -64,6 +61,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
      * @return
      */
     @Override
+    @Transactional
     public Map<String, Object> execImportExamStudentLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) {
         Long orgId = Long.parseLong(String.valueOf(map.get("orgId")));
         Long examId = Long.parseLong(String.valueOf(map.get("examId")));
@@ -226,6 +224,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
      * @return
      */
     @Override
+    @Transactional
     public Map<String, Object> execImportRoomCodeLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) {
         Long orgId = null;
         if (Objects.nonNull(map.get("orgId"))) {
@@ -381,7 +380,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据处理中," + tbTaskHistory.getSummary());
         }
         tbTaskHistory.setProgress(progress.doubleValue());
-        tbTaskHistoryService.updateById(tbTaskHistory);
         return txtList;
     }
 
@@ -420,7 +418,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
             txtList.add(DateUtil.format(new Date(), timeFormat) + "->数据导出中," + tbTaskHistory.getSummary());
         }
         tbTaskHistory.setProgress(progress.doubleValue());
-        tbTaskHistoryService.updateById(tbTaskHistory);
         return txtList;
     }
 

+ 0 - 1
themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -200,7 +200,6 @@ public class MqLogicServiceImpl implements MqLogicService {
      * @param key
      */
     @Override
-    @Transactional
     public void execMqTaskLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> map = (Map<String, Object>) mqDto.getBody();