3.4.3 update-bug-1217

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

@@ -73,7 +73,7 @@ public interface BasicExamStudentService extends IService<BasicExamStudent> {
 
     void updateTeacherIdById(List<BasicExamStudent> basicExamStudentList);
 
-    void updatePaperNumberAndPaperTypeById(List<ExamStudent> examStudentList, BasicCardRule basicCardRule);
+    void updatePaperNumberAndPaperTypeById(List<ExamStudent> examStudentList, BasicCardRule basicCardRule, Boolean openAb);
 
     void updateMarkData(Long examId, List<BasicExamStudent> basicExamStudentList, Long createId);
 

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.DeleteBasicExamStudentStatusDto;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
-import com.qmth.distributed.print.business.bean.dto.importFile.BasicExamStudentImport;
 import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
 import com.qmth.distributed.print.business.bean.query.BasicExamStudentPageQuery;
 import com.qmth.distributed.print.business.bean.query.BasicExamStudentQuery;
@@ -462,7 +461,7 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
     }
 
     @Override
-    public void updatePaperNumberAndPaperTypeById(List<ExamStudent> examStudentList, BasicCardRule basicCardRule) {
+    public void updatePaperNumberAndPaperTypeById(List<ExamStudent> examStudentList, BasicCardRule basicCardRule, Boolean openAb) {
         for (ExamStudent examStudent : examStudentList) {
             BasicExamStudent basicExamStudent = this.getById(examStudent.getBasicStudentId());
             if (StringUtils.isNoneBlank(basicExamStudent.getPaperNumber(), basicExamStudent.getPaperType()) && !examStudent.getPaperNumber().equals(basicExamStudent.getPaperNumber())) {
@@ -474,9 +473,10 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
                     codeNameEnableValue.setValue(examStudent.getPaperNumber());
                 }
             }
+            //
             this.update(new UpdateWrapper<BasicExamStudent>().lambda()
                     .set(BasicExamStudent::getPaperNumber, examStudent.getPaperNumber())
-                    .set(ExamNumberStyleEnum.PRINT.equals(basicCardRule.getExamNumberStyle()), BasicExamStudent::getPaperType, examStudent.getPaperType())
+                    .set(ExamNumberStyleEnum.PRINT.equals(basicCardRule.getExamNumberStyle()) || (!openAb && ExamNumberStyleEnum.FILL.equals(basicCardRule.getExamNumberStyle())), BasicExamStudent::getPaperType, examStudent.getPaperType())
                     .set(BasicExamStudent::getRequiredFields, JSON.toJSONString(requiredFieldList))
                     .eq(BasicExamStudent::getId, examStudent.getBasicStudentId()));
         }

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

@@ -205,7 +205,7 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
                 ExamTask examTask = examTaskService.getByExamIdAndPaperNumber(tbTaskPdf.getExamId(), examDetailCourse.getPaperNumber());
                 //查询题卡规则
                 BasicCardRule basicCardRule = basicCardRuleService.getById(examTask.getCardRuleId());
-                basicExamStudentService.updatePaperNumberAndPaperTypeById(examStudentList, basicCardRule);
+                basicExamStudentService.updatePaperNumberAndPaperTypeById(examStudentList, basicCardRule, examTask.getOpenAb());
 
             }
         } catch (Exception e) {

teachcloud-data/src/main/java/com/qmth/teachcloud/data/DataUtil.java

@@ -23,7 +23,7 @@ import java.util.*;
 public class DataUtil {
 
     // 一页1000条
-    private static int PAGE_SIZE = 2;
+    private static int PAGE_SIZE = 1000;
 
     @Resource
     private CommonCacheService commonCacheService;

teachcloud-data/src/main/java/com/qmth/teachcloud/data/enums/DataType.java

@@ -1,11 +1,11 @@
 package com.qmth.teachcloud.data.enums;
 
 public enum DataType {
-    A("v_org", "组织架构"),
-    B("v_user", "用户数据"),
-    C("v_course", "课程数据"),
-    D("v_student", "考生数据"),
-    E("v_exam_task", "命题任务数据");
+    A("YJXT_ZZJG", "组织架构"),
+    B("YJXT_YHXX", "用户数据"),
+    C("YJXT_KCXX", "课程数据"),
+    D("YJXT_KSXX", "考生数据"),
+    E("YJXT_MTRW", "命题任务数据");
 
     DataType(String table, String name) {
         this.table = table;

teachcloud-data/src/main/java/com/qmth/teachcloud/data/service/impl/TSyncDataServiceImpl.java

@@ -39,6 +39,7 @@ public class TSyncDataServiceImpl extends MppServiceImpl<TSyncDataMapper, TSyncD
     public TSyncData saveData(TSyncData tSyncData) {
         TSyncData syncData = this.selectByMultiId(new TSyncData(tSyncData.getSchoolId(), tSyncData.getExamId()));
         if (syncData == null) {
+            tSyncData.setEnable(true);
             tSyncData.setCreateTime(System.currentTimeMillis());
             this.saveOrUpdateByMultiId(tSyncData);