3.4.2 update-bug-1217

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

@@ -72,7 +72,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

@@ -459,7 +459,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())) {
@@ -473,7 +473,7 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
             }
             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) {