3.2.7 优化后测试bug修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetailCourse.java

@@ -29,11 +29,6 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
     @TableField("school_id")
     private Long schoolId;
 
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("exam_detail_id")
     private Long examDetailId;
@@ -79,14 +74,6 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
     public String getAttachmentId() {
         return attachmentId;
     }

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

@@ -220,17 +220,6 @@ public interface PrintCommonService {
      */
     void checkData(Long schoolId, Long examId, String courseCode, String paperNumber, SysUser user) throws IOException;
 
-    /**
-     * 保存考务数据
-     *
-     * @param schoolId
-     * @param extendFields
-     * @param classIds
-     * @param examDetailCourseId
-     * @param sysUser
-     */
-    List<ExamStudent> createBatchStudent(Long schoolId, String extendFields, List<String> classIds, Long examDetailCourseId, SysUser sysUser);
-
     /**
      * 根据学生集合创建考生考务数据
      *

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

@@ -687,10 +687,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             String majorName = examinationImportDto.getMajorName();
             String clazzName = examinationImportDto.getClazzName();
 
-            if (!examStudentTicketNumberList.isEmpty() && examStudentTicketNumberList.contains(ticketNumber)) {
-                ticketNumberRepeatList.add(ticketNumber);
-            }
-
             List<FieldsDto> fieldsDtoList = examinationImportDto.getSecondaryFieldList();
             List<ExtendFieldsDto> extendFieldsDtoList = this.getExtendFieldsByFields(fieldsDtoList);
 
@@ -711,16 +707,15 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             examStudent.setStudentClazzType(StudentClazzEnum.BASIC_CLAZZ);
             examStudent.setCreateId(sysUser.getId());
             examStudentList.add(examStudent);
-
         }
 
         // 校验准考证号是否重复
-        if (!ticketNumberRepeatList.isEmpty()) {
-            stringJoiner.add("考号[" + String.join(",", ticketNumberRepeatList) + "]在当前考试下已存在");
-        }
-        if (stringJoiner.toString().length() > 1) {
-            throw ExceptionResultEnum.ERROR.exception(stringJoiner.toString());
-        }
+//        if (!ticketNumberRepeatList.isEmpty()) {
+//            stringJoiner.add("考号[" + String.join(",", ticketNumberRepeatList) + "]在当前考试下已存在");
+//        }
+//        if (stringJoiner.toString().length() > 1) {
+//            throw ExceptionResultEnum.ERROR.exception(stringJoiner.toString());
+//        }
         try {
             examStudentService.saveBatch(examStudentList);
         } catch (Exception e) {

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

@@ -101,6 +101,9 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Resource
     BasicRoleDataPermissionService basicRoleDataPermissionService;
 
+    @Resource
+    ExamTaskSyncService examTaskSyncService;
+
     @Transactional
     @Override
     public boolean enable(ExamTaskDetail examTaskDetail) {
@@ -549,6 +552,13 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 examDetailCourseService.update(examDetailCourseUpdateWrapper);
             }
         }
+        // 推送数据改为作废
+        UpdateWrapper<ExamTaskSync> examTaskSyncUpdateWrapper = new UpdateWrapper<>();
+        examTaskSyncUpdateWrapper.lambda().set(ExamTaskSync::getPaperNumber, paperNumberCancel)
+                .eq(ExamTaskSync::getSchoolId, examTask.getSchoolId())
+                .eq(ExamTaskSync::getExamId, examTask.getExamId())
+                .eq(ExamTaskSync::getPaperNumber, paperNumber);
+        examTaskSyncService.update(examTaskSyncUpdateWrapper);
         return true;
     }
 

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

@@ -1425,7 +1425,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         ExamDetailCourse examDetailCourse = new ExamDetailCourse();
                         examDetailCourse.setId(SystemConstant.getDbUuid());
                         examDetailCourse.setSchoolId(schoolId);
-                        examDetailCourse.setOrgId(sysUser.getOrgId());
                         examDetailCourse.setExamDetailId(examDetail.getId());
                         examDetailCourse.setCourseCode(examTask.getCourseCode());
                         examDetailCourse.setCourseName(examTask.getCourseName());
@@ -1488,7 +1487,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     ExamDetailCourse examDetailCourse = new ExamDetailCourse();
                     examDetailCourse.setId(SystemConstant.getDbUuid());
                     examDetailCourse.setSchoolId(schoolId);
-                    examDetailCourse.setOrgId(sysUser.getOrgId());
                     examDetailCourse.setExamDetailId(examDetail.getId());
                     examDetailCourse.setCourseCode(examTask.getCourseCode());
                     examDetailCourse.setCourseName(examTask.getCourseName());

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

@@ -1011,36 +1011,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         }
     }
 
-    @Override
-    public List<ExamStudent> createBatchStudent(Long schoolId, String extendFields, List<String> classIds, Long examDetailCourseId, SysUser sysUser) {
-        AtomicInteger atomicInteger = new AtomicInteger(1);
-        List<ExamStudent> examStudentAll = new ArrayList<>();
-        SerialNumberParams ticketNumberParams = new SerialNumberParams("ticketNumber-" + schoolId, DateUtil.format(new Date(), "yyyyMM"), 6);
-
-        for (String classId : classIds) {
-            List<ExamStudent> basicStudents = examStudentService.listExamStudentBySchoolIdAndClazzId(schoolId, classId);
-
-            basicStudents = basicStudents.stream().map(examStudent -> {
-                examStudent.setId(SystemConstant.getDbUuid());
-                examStudent.setSchoolId(schoolId);
-                examStudent.setOrgId(sysUser.getOrgId());
-                examStudent.setExamDetailCourseId(examDetailCourseId);
-                // 准考证号（年月+000001）
-                examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
-                examStudent.setExtendFields(extendFields);
-                examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
-                examStudent.setCreateId(sysUser.getId());
-                examStudent.setPaperNumber(examDetailCourseService.getById(examDetailCourseId).getPaperNumber());
-                return examStudent;
-            }).collect(Collectors.toList());
-            if (!CollectionUtils.isEmpty(basicStudents)) {
-                examStudentAll.addAll(basicStudents);
-            }
-        }
-
-        return examStudentAll;
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<ExamStudent> createBatchStudentByStudentList(Long schoolId, Long examId, String semesterId, String paperNumber, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, Long cardRuleId, SysUser sysUser) {
@@ -1150,6 +1120,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             if (!CollectionUtils.isEmpty(usedTicketNumberList) && usedTicketNumberList.contains(ticketNumber)) {
                 createTicketNumber(usedTicketNumberList, schoolId, totalDigit);
             }
+            usedTicketNumberList.add(ticketNumber);
 
         } finally {
             lock.unlock();

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

@@ -86,7 +86,7 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
             super.createTxt(tbTask);
 
             // 当前任务结束后，其它任务开始
-            examDetailService.startInitTask(tbTask.getSchoolId());
+//            examDetailService.startInitTask(tbTask.getSchoolId());
         }
         return ResultUtil.ok(map);
     }

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

@@ -918,7 +918,7 @@ public class CreatePdfUtil {
     /**
      * 替换自定义题卡参数
      *
-     * @param examCardDetail
+     * @param examCard
      * @return
      * @throws IOException
      */

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -191,6 +191,7 @@ DELETE FROM `sys_privilege` WHERE (`id` = '436');
 DELETE FROM `sys_privilege` WHERE (`id` = '307');
 DELETE FROM `sys_privilege` WHERE (`id` = '140');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('174', '导入模板下载', '/api/admin/common/download_import_template', 'URL', '149', '15', 'SYS', '1', '1', '1');
+UPDATE `sys_privilege` SET `url` = 'Assign' WHERE (`id` = '448');
 
 
 ALTER TABLE `exam_card`
@@ -208,4 +209,6 @@ update exam_card a set a.html_content = (select b.html_content from exam_card_de
 update exam_card a set a.backup_attachment = (select b.attachment_id from exam_card_detail b where a.id = b.card_id);
 update exam_card a set a.jpg_attachment = (select b.jpg_attachment_info from exam_card_detail b where a.id = b.card_id);
 
-ALTER TABLE `exam_task` DROP COLUMN `paper_number_id`;
+ALTER TABLE `exam_task` DROP COLUMN `paper_number_id`;
+
+ALTER TABLE `exam_detail_course` DROP COLUMN `org_id`;

distributed-print-business/src/main/resources/mapper/ExamPaperStructureMapper.xml

@@ -56,7 +56,7 @@
         <where>
             and ed.school_id = #{schoolId}
             AND ets.sync_status = #{syncStatus}
-            AND be.enable = TRUE
+            AND be.enable = TRUE AND ed.status = 'FINISH'
             <if test="semesterId != null">
                 and be.semester_id = #{semesterId}
             </if>

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -58,8 +58,6 @@ public class ExamDetailController {
     @Resource
     private ExamDetailService examDetailService;
     @Resource
-    private PrintCommonService printCommonService;
-    @Resource
     private ExamStudentService examStudentService;
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;