wangliang 1 жил өмнө
parent
commit
6819e1efb9

+ 2 - 6
distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -238,12 +238,8 @@ public class TCFinalScoreController {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         for (PaperStructResult paperStructResult : paperStructParams.getPaperStruct()) {
-            if (Objects.isNull(paperStructResult.getMainNumber())) {
-                throw ExceptionResultEnum.ERROR.exception("大题号为空");
-            }
-            if (Objects.isNull(paperStructResult.getSubNumber())) {
-                throw ExceptionResultEnum.ERROR.exception("小题号为空");
-            }
+            Objects.requireNonNull(paperStructResult.getMainNumber(), "大题号为空");
+            Objects.requireNonNull(paperStructResult.getSubNumber(), "小题号为空");
             if (!CollectionUtils.isEmpty(paperStructResult.getTargetList()) && paperStructResult.getTargetList().size() > 1) {
                 throw ExceptionResultEnum.ERROR.exception("一个题只能属于一个目标");
             }

+ 0 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -136,7 +136,6 @@ public class TRBasicInfoController {
                 trBasicInfo.setReportResult(new ReportResult(new ReportCommonDto(examId, courseCode, markPaper.getCourseName(), paperNumber), reportCourseBasicInfoDto, reportCourseEvaluationSpreadDto, reportCourseEvaluationResultDto, reportCourseEvaluationResultDetailDto));
             }
         }
-
         trBasicInfo.updateInfo(sysUser.getId());
         //课程目标达成评价明细结果-课程目标达成评价值图
         trBasicInfoService.saveOrUpdate(trBasicInfo);
@@ -215,8 +214,6 @@ public class TRBasicInfoController {
                         courseTarget.toString(), reportCourseEvaluationResultDto.getTargetList().size());
 
                 CourseReportBean courseReportBean = new CourseReportBean(trBasicInfo.getOpenTime() + "《" + trBasicInfo.getCourseName() + "》", courseBasicBean);
-
-
                 //table1-课程目标目标与毕业要求指标点的对应关系
                 courseReportBean.setCourseTargetTable1(trBasicInfoService.buildWordTable1(courseTargetWordDtoList));
 
@@ -247,7 +244,6 @@ public class TRBasicInfoController {
                 // 导出
                 String fileName = Objects.nonNull(basicSchool) ? basicSchool.getName() + "_" + courseReportBean.getTitle1() + "_" + ImportTemplateEnum.STATIC_COURSE_DEGREE_REPORT.getFileName() + SystemConstant.WORD_PREFIX : courseReportBean.getTitle1() + "_" + ImportTemplateEnum.STATIC_COURSE_DEGREE_REPORT.getFileName() + SystemConstant.WORD_PREFIX;
                 FileUtil.outputFile(ServletUtil.getResponse(), new FileInputStream(txtFileTemp), fileName);
-
 //            XWPFTemplate template = XWPFTemplate.compile("/Users/king/git/teachcloud-server/distributed-print/src/main/resources/static/course_degree_report.docx").render(courseReportBean);
 //            template.writeToFile("/Users/king/Downloads/demo_course_degree_report.docx");
             }