Browse Source

3.4.0 update

xiaofei 11 months ago
parent
commit
96fdeb52bd

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

@@ -398,15 +398,15 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
                     CollectionUtils.addAll(examStudentInfoList, examStudentService.listStudentByExamDetailCourseId(examDetailCourse.getId()));
                 }
 
-                if(ExamModelEnum.MODEL2.equals(basicExam.getExamModel()) && CollectionUtils.isEmpty(examStudentInfoList) && examDetail.getTotalSubjects() > 0){
+                if (ExamModelEnum.MODEL2.equals(basicExam.getExamModel()) && CollectionUtils.isEmpty(examStudentInfoList) && examDetail.getTotalSubjects() > 0) {
                     for (ExamDetailCourse examDetailCourse : examDetailCourseList) {
                         for (Integer i = 0; i < examDetailCourse.getTotalSubjects(); i++) {
                             ExamStudentInfo examStudentInfo = new ExamStudentInfo();
                             List<CodeNameEnableValue> fieldList = new ArrayList<>();
                             // 只有试卷编号和教学班
-                            fieldList.add(new CodeNameEnableValue(RequiredFieldsEnum.PAPER_NUMBER.getCode(), RequiredFieldsEnum.PAPER_NUMBER.getName(),RequiredFieldsEnum.PAPER_NUMBER.getEnable(), examDetailCourse.getPaperNumber()));
-                            fieldList.add(new CodeNameEnableValue(RequiredFieldsEnum.TEACH_CLASS_NAME.getCode(), RequiredFieldsEnum.TEACH_CLASS_NAME.getName(),RequiredFieldsEnum.TEACH_CLASS_NAME.getEnable(), examDetailCourse.getClazzName()));
-                            examStudentInfo.setFieldList(fieldList);
+                            fieldList.add(new CodeNameEnableValue(RequiredFieldsEnum.PAPER_NUMBER.getCode(), RequiredFieldsEnum.PAPER_NUMBER.getName(), RequiredFieldsEnum.PAPER_NUMBER.getEnable(), examDetailCourse.getPaperNumber()));
+                            fieldList.add(new CodeNameEnableValue(RequiredFieldsEnum.TEACH_CLASS_NAME.getCode(), RequiredFieldsEnum.TEACH_CLASS_NAME.getName(), RequiredFieldsEnum.TEACH_CLASS_NAME.getEnable(), examDetailCourse.getClazzName()));
+                            examStudentInfo.setRequiredFields(JSON.toJSONString(fieldList));
                             examStudentInfoList.add(examStudentInfo);
                         }
                     }
@@ -431,5 +431,4 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
         }
         examDetailService.updateById(examDetail);
     }
-
 }