caozixuan преди 3 години
родител
ревизия
6d737f2702

+ 7 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -140,7 +140,13 @@ public abstract class AsyncImportTaskTemplete {
             log.error(SystemConstant.LOG_ERROR, e);
             StringJoiner stringJoinerSummary = new StringJoiner("").add(tbTask.getSummary()).add("\n");
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_CREATE_TXT_TITLE, EXCEPTION_DATA, e.getMessage()));
-            tbTask.setSummary(stringJoinerSummary.toString());
+
+            String summary = stringJoinerSummary.toString();
+            if (summary.length() >= 65535){
+                summary = "Data too long : " + summary.substring(0,100) + "......" + summary.substring(summary.length() - 100);
+            }
+
+            tbTask.setSummary(summary);
             tbTask.setResult(TaskResultEnum.ERROR);
 //            TBTask dbTask = tbTaskService.getById(tbTask.getId());
 //            if (tbTask.getVersion() == dbTask.getVersion()) {

+ 6 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicStudentServiceImpl.java

@@ -321,12 +321,14 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                 }
                 if (SystemConstant.longNotNull(campusId)) {
                     if (!campusId.equals(basicClazz.getCampusId())) {
-                        throw ExceptionResultEnum.ERROR.exception("学生所属班级信息和学生信息中【校区】不对应");
+                        String exception = "学生信息【" + studentName + "(" + studentCode + ")" + "-" + basicCampusService.getById(campusId).getCampusName() + "】中的校区和学生所属班级信息【" + basicClazz.getClazzName() + "-" + basicCampusService.getById(basicClazz.getCampusId()).getCampusName() + "】中的校区不对应";
+                        throw ExceptionResultEnum.ERROR.exception(exception);
                     }
                 }
                 if (SystemConstant.longNotNull(majorId)) {
                     if (!majorId.equals(basicClazz.getMajorId())) {
-                        throw ExceptionResultEnum.ERROR.exception("学生所属班级信息和学生信息中【专业】不对应");
+                        String exception = "学生信息【" + studentName + "(" + studentCode + ")" + "-" + basicMajorService.getById(majorId).getName() + "】中的专业和学生所属班级信息【" + basicClazz.getClazzName() + "-" + basicMajorService.getById(basicClazz.getMajorId()).getName() + "】中的专业不对应";
+                        throw ExceptionResultEnum.ERROR.exception(exception);
                     }
                 }
             }
@@ -340,7 +342,8 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                 }
                 if (SystemConstant.longNotNull(collegeId)) {
                     if (!collegeId.equals(basicMajor.getBelongOrgId())) {
-                        throw ExceptionResultEnum.ERROR.exception("学生所属专业信息和学生信息中【学院】不对应");
+                        String exception = "学生信息【" + studentName + "(" + studentCode + ")" + "-" + sysOrgService.getById(collegeId).getName() + "】中的学院和学生所属专业信息【" + basicMajor.getName() + "-" + sysOrgService.getById(basicMajor.getBelongOrgId()).getName() + "】中的学院不对应";
+                        throw ExceptionResultEnum.ERROR.exception(exception);
                     }
                 }
             }