bugfix

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

@@ -194,8 +194,8 @@ public class TaskImportCommon {
                     .replaceAll("'", "");
             errorMessage = "错误信息:[" + FieldUniqueEnum.convertToCode(columnStr) + "数据不允许重复插入]";
         }
-        if (Objects.nonNull(this.map.get("remark"))) {
-            errorMessage = errorMessage + "->" + this.map.get("remark");
+        if (Objects.nonNull(this.map.get("dataRemark"))) {
+            errorMessage = errorMessage + "->" + this.map.get("dataRemark");
         }
         txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->" + exceptionStr + errorMessage);
         this.tbTaskHistory.setSummary(exceptionStr);

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

@@ -220,7 +220,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                             .eq(TBExamInvigilateUserTemp::getRoomCode, strs[1])
                             .eq(TBExamInvigilateUserTemp::getRoomName, strs[2]);
 
-                    map.put("remark", "编码:" + strs[1] + ",名称:" + strs[2]);
+                    map.put("dataRemark", "编码:" + strs[1] + ",名称:" + strs[2]);
                     TBExamInvigilateUserTemp tbExamInvigilateUserTemp = tbExamInvigilateUserTempService.getOne(tbExamInvigilateUserTempQueryWrapper);
                     tbExamInvigilateUserTemp = Objects.isNull(tbExamInvigilateUserTemp) ? new TBExamInvigilateUserTemp(Long.parseLong(strs[0]), orgId, strs[1], strs[2]) : tbExamInvigilateUserTemp;
 //                    tbExamInvigilateUserTempList.add(tbExamInvigilateUserTemp);
@@ -281,11 +281,11 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     RoomCodeImportDto roomCodeImportDto = (RoomCodeImportDto) subList.get(y);
                     roomCodeSet.add(roomCodeImportDto.getRoomCode());
                     roomNameSet.add(roomCodeImportDto.getRoomName());
-                    map.put("remark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
+                    map.put("dataRemark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
                     dataVerify(examId, roomCodeImportDto.getTeacher1(), roomCodeImportDto.getTeacher1Pwd(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId, tbUserList, tbUserRoleList, tbExamInvigilateUserList);
-                    map.put("remark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
+                    map.put("dataRemark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
                     dataVerify(examId, roomCodeImportDto.getTeacher2(), roomCodeImportDto.getTeacher2Pwd(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId, tbUserList, tbUserRoleList, tbExamInvigilateUserList);
-                    map.put("remark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
+                    map.put("dataRemark", "编码:" + roomCodeImportDto.getRoomCode() + ",名称:" + roomCodeImportDto.getRoomName());
                     dataVerify(examId, roomCodeImportDto.getTeacher3(), roomCodeImportDto.getTeacher3Pwd(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId, tbUserList, tbUserRoleList, tbExamInvigilateUserList);
                 }
                 txtList = this.importProgress(max, min, size, txtList, tbTaskHistory);