更改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachClazzServiceImpl.java

@@ -71,6 +71,20 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
         if (SystemConstant.isOneNull(teachClazzName, teachCourseId)) {
             throw ExceptionResultEnum.ERROR.exception("参数异常");
         }
+
+        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
+        TeachClazz check = this.getOne(new QueryWrapper<TeachClazz>()
+                .lambda()
+                .eq(TeachClazz::getSchoolId, schoolId)
+                .eq(TeachClazz::getTeachClazzName, teachClazzName));
+
+        if (Objects.nonNull(check) && !check.getId().equals(id)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程【" + basicCourseService.getById(teachCourseService.getById(check.getTeachCourseId()).getBasicCourseId()).getName()
+                    + "】中已存在班级名称为【" + check.getTeachClazzName() + "】的班级");
+        }
+
+
+
         if (SystemConstant.longNotNull(id)) {
             // 重命名课程
             result = this.update(new UpdateWrapper<TeachClazz>().lambda().eq(TeachClazz::getId, id).set(TeachClazz::getTeachClazzName, teachClazzName));
@@ -83,17 +97,6 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
                 throw ExceptionResultEnum.ERROR.exception("用户身份信息异常");
             }
 
-            Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
-            TeachClazz check = this.getOne(new QueryWrapper<TeachClazz>()
-                    .lambda()
-                    .eq(TeachClazz::getSchoolId, schoolId)
-                    .eq(TeachClazz::getTeachClazzName, teachClazzName));
-
-            if (Objects.nonNull(check)) {
-                throw ExceptionResultEnum.ERROR.exception("教学课程【" + basicCourseService.getById(teachCourseService.getById(check.getTeachCourseId()).getBasicCourseId()).getName()
-                        + "】中已存在班级名称为【" + check.getTeachClazzName() + "】的班级");
-            }
-
             TeachClazz teachClazz = new TeachClazz();
             teachClazz.setSchoolId(schoolId);
             teachClazz.setTeachClazzName(teachClazzName);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -771,7 +771,7 @@ public class CreatePdfUtil {
                     int pages = dto.getPages();
                     pagesList.add(pages);
                     PdfDto pdfDto = PdfUtil.addPdfPage(dto.getFile());
-                    File file = PdfUtil.addWaterMark(dto.getFile(), waterMarkNames, 1f, 12, 0);
+                    File file = paperPdfDto.size() > 1 ? PdfUtil.addWaterMark(dto.getFile(), waterMarkNames, 1f, 12, 0): dto.getFile();
                     pdfList.add(new PdfDto(file.getPath(), dto.getPageSize(), pdfDto.getPageCount()));
                 }
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -386,7 +386,7 @@ public class PdfUtil {
                 reader.close();
             }
             if (outputFile.exists()) {
-                outputFile.delete();
+//                outputFile.delete();
             }
         }
         return null;

distributed-print-business/src/main/resources/db/1、init-table.sql

@@ -350,6 +350,7 @@ CREATE TABLE `basic_exam_rule` (
                                    `review` tinyint NOT NULL COMMENT '0-禁用，1-启用',
                                    `include_paper` tinyint NOT NULL COMMENT '0-禁用，1-启用',
                                    `print_method` varchar(6) NOT NULL COMMENT 'AUTO-自动，MANUAL-手动',
+                                   `exam_number_digit` int DEFAULT NULL COMMENT '考号位数',
                                    `create_id` bigint DEFAULT NULL COMMENT '创建人',
                                    `create_time` bigint DEFAULT NULL COMMENT '创建时间',
                                    `update_id` bigint DEFAULT NULL COMMENT '更新人',