课程目标达成度修改

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

@@ -92,11 +92,16 @@ public class ObeReportController {
                             examId, obeCourseRequirementDtoList, obeSubRequirementsDtoMap);
                 }
                 obeCourseRequirementResultDto = obeCourseRequirementReportService.matrixCourseReport(obeCourseRequirementDtoList, obeSubRequirementsDtoMap);
-                obeCourseRequirementReportService.removeReport(cultureProgramId);
+
                 ObeCourseRequirementReport obeCourseRequirementReport = new ObeCourseRequirementReport(
                         cultureProgramId, Objects.nonNull(obeCourseRequirementResultDto) ? JacksonUtil.parseJson(obeCourseRequirementResultDto) : null,
-                        !CollectionUtils.isEmpty(obeCourseRequirementDtoList) ? JacksonUtil.parseJson(obeCourseRequirementDtoList) : null, Objects.nonNull(obeCourseRequirementResultDto) ? obeCourseRequirementResultDto.getMatrixDegree().doubleValue() : null);
-                obeCourseRequirementReportService.save(obeCourseRequirementReport);
+                        !CollectionUtils.isEmpty(obeCourseRequirementDtoList) ? JacksonUtil.parseJson(obeCourseRequirementDtoList) : null, Objects.nonNull(obeCourseRequirementResultDto) && Objects.nonNull(obeCourseRequirementResultDto.getMatrixDegree()) ? obeCourseRequirementResultDto.getMatrixDegree().doubleValue() : null);
+                obeCourseRequirementReportService.removeReport(cultureProgramId);
+                if (Objects.nonNull(obeCourseRequirementReport.getRequirementRadar()) &&
+                        Objects.nonNull(obeCourseRequirementReport.getRequirementDetail())
+                        && Objects.nonNull(obeCourseRequirementReport.getRequirementDegree())) {
+                    obeCourseRequirementReportService.save(obeCourseRequirementReport);
+                }
             }
         }
         return ResultUtil.ok(obeCourseRequirementResultDto);

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

@@ -82,7 +82,7 @@ public class TCFinalScoreController {
     @ApiOperation(value = "导入期末成绩-模板下载")
     @RequestMapping(value = "/final_score/template_download", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void finalScoreTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public void finalScoreTemplateDownload(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                            @ApiParam(value = "科目id", required = true) @RequestParam Long courseId,
                                            @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                            @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) throws IOException {
@@ -118,7 +118,7 @@ public class TCFinalScoreController {
     @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     public Result finalScoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-                                   @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                   @ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                    @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,
                                    @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                    @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) {
@@ -148,8 +148,8 @@ public class TCFinalScoreController {
     @RequestMapping(value = "/final_score/choose_paper", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
     @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
-    public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
+                                            @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode,
                                             @ApiParam(value = "教学课程id", required = true) @RequestParam Long teachCourseId) {
         return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, courseCode)));
     }
@@ -159,7 +159,7 @@ public class TCFinalScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
     @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     @Aac(rateLimit = @RateLimit(count = 1, period = 1000L))
-    public Result finalScoreSync(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public Result finalScoreSync(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                  @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                  @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) {
@@ -188,8 +188,8 @@ public class TCFinalScoreController {
     @ApiOperation(value = "期末成绩列表")
     @RequestMapping(value = "/final_score/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TCFinalScore.class)})
-    public Result finalScoreList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                 @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public Result finalScoreList(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
+                                 @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode,
                                  @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                  @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId,
                                  @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,

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

@@ -112,9 +112,9 @@ public class TCPaperStructController {
     @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
     @Aac(rateLimit = @RateLimit(count = 1, period = 1000L))
-    public Result finalScorePaperStructDimensionSync(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public Result finalScorePaperStructDimensionSync(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                                      @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,
-                                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                                     @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode,
                                                      @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                                      @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) {
         Objects.requireNonNull(paperNumber, "未查询到题和知识点对应关系请手动关联");
@@ -198,9 +198,9 @@ public class TCPaperStructController {
     @ApiOperation(value = "期末成绩试卷蓝图查询")
     @RequestMapping(value = "/final_score/paper_struct/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图查询", response = PaperStructDimensionResult.class)})
-    public Result finalScorePaperStructQuery(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public Result finalScorePaperStructQuery(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                              @ApiParam(value = "科目id", required = true) @RequestParam Long courseId,
-                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                             @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode,
                                              @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                              @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) {
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(cultureProgramId, courseId);