add.课程目标达成情况评价依据合理性审核表

distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCourseOutlineController.java

@@ -128,14 +128,14 @@ public class ObeCourseOutlineController {
     @RequestMapping(value = "/audit_report", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = AuditReport.class) })
     public Result auditReport(@ApiParam(value = "课程大纲id") @RequestParam(required = false) Long obeCourseOutlineId) {
-        return ResultUtil.ok(obeCourseOutlineAuditReportService.getOrBuildAuditReport(obeCourseOutlineId, false));
+        return ResultUtil.ok(obeCourseOutlineAuditReportService.getAuditReport(obeCourseOutlineId, false));
     }
 
     @ApiOperation(value = "课程大纲-审核及合理性")
     @RequestMapping(value = "/audit_rationality_report", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = AuditReport.class) })
     public Result auditRationalityReport(@ApiParam(value = "课程大纲id") @RequestParam(required = false) Long obeCourseOutlineId) {
-        return ResultUtil.ok(obeCourseOutlineAuditReportService.getOrBuildAuditReport(obeCourseOutlineId, true));
+        return ResultUtil.ok(obeCourseOutlineAuditReportService.getAuditReport(obeCourseOutlineId, true));
     }
 
     @ApiOperation(value = "课程大纲-审核报告保存")

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/been/result/report/audit/AuditReport.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -15,12 +14,6 @@ import javax.validation.constraints.NotNull;
  */
 public class AuditReport {
 
-    @ApiModelProperty("id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少id")
-    @Range(min = 1L, message = "缺少id")
-    private Long id;
-
     @ApiModelProperty("课程大纲id")
     @JsonSerialize(using = ToStringSerializer.class)
     @NotNull(message = "缺少课程大纲id")
@@ -28,24 +21,14 @@ public class AuditReport {
     private Long courseOutlineId;
 
     @ApiModelProperty("课程基础信息")
-    @NotEmpty(message = "缺少报表课程基本信息")
     private CourseBasicInfo courseBasicInfo;
 
     @ApiModelProperty("课程目标情况")
-    @NotEmpty(message = "缺少报表课程目标情况")
     private CourseTargetInfo courseTargetInfo;
 
     @ApiModelProperty("合理性评价")
     private RationalityEvaluation rationalityEvaluation;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getCourseOutlineId() {
         return courseOutlineId;
     }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/ObeCourseOutlineAuditReportService.java

@@ -24,7 +24,7 @@ public interface ObeCourseOutlineAuditReportService extends IService<ObeCourseOu
      * @param rationality     展示合理性评价部分
      * @return 审核报告
      */
-    AuditReport getOrBuildAuditReport(Long courseOutlineId, boolean rationality);
+    AuditReport getAuditReport(Long courseOutlineId, boolean rationality);
 
     /**
      * 获取课程基本信息

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCourseOutlineAuditReportServiceImpl.java

@@ -42,9 +42,8 @@ public class ObeCourseOutlineAuditReportServiceImpl extends ServiceImpl<ObeCours
     @Resource
     private ObeCourseTargetService obeCourseTargetService;
 
-    @Transactional
     @Override
-    public AuditReport getOrBuildAuditReport(Long courseOutlineId, boolean rationality) {
+    public AuditReport getAuditReport(Long courseOutlineId, boolean rationality) {
         AuditReport result = new AuditReport();
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.getById(courseOutlineId);
         if (Objects.isNull(obeCourseOutline)) {
@@ -63,16 +62,22 @@ public class ObeCourseOutlineAuditReportServiceImpl extends ServiceImpl<ObeCours
 
             CourseBasicInfo courseBasicInfo = JSON.parseObject(courseBasicInfoStr, CourseBasicInfo.class);
             CourseTargetInfo courseTargetInfo = JSON.parseObject(courseTargetInfoStr, CourseTargetInfo.class);
-            RationalityEvaluation rationalityEvaluation = JSON.parseObject(rationalityEvaluationStr,
-                    RationalityEvaluation.class);
+            RationalityEvaluation rationalityEvaluation = null;
+            if (SystemConstant.strNotNull(rationalityEvaluationStr)) {
+                rationalityEvaluation = JSON.parseObject(rationalityEvaluationStr, RationalityEvaluation.class);
+            }
 
             if (!Objects.equals(auditSign, outlineSign)) {
                 // 权重设置有变化 -> 重新生成权重信息
                 courseTargetInfo = this.getCourseTargetInfo(courseOutlineId);
             }
-            if (rationality && Objects.isNull(rationalityEvaluation)) {
-                // 如果缺少合理性信息 -> 重新生成
-                rationalityEvaluation = this.getRationalityEvaluation(courseOutlineId);
+            if (rationality) {
+                if (Objects.isNull(rationalityEvaluation)) {
+                    // 如果缺少合理性信息 -> 重新生成
+                    rationalityEvaluation = this.getRationalityEvaluation(courseOutlineId);
+                }
+            } else {
+                rationalityEvaluation = null;
             }
             if (Objects.isNull(courseTargetInfo.getDate())) {
                 courseTargetInfo.setDate(System.currentTimeMillis());
@@ -89,19 +94,17 @@ public class ObeCourseOutlineAuditReportServiceImpl extends ServiceImpl<ObeCours
             result.setCourseBasicInfo(courseBasicInfo);
             result.setCourseTargetInfo(courseTargetInfo);
             result.setRationalityEvaluation(rationalityEvaluation);
-            result.setId(dbReport.getId());
         } else {
             // 还未生成过报告 -> 直接生成
             result.setCourseBasicInfo(this.getCourseBasicInfo(courseOutlineId));
             result.setCourseTargetInfo(this.getCourseTargetInfo(courseOutlineId));
-            RationalityEvaluation rationalityEvaluation = new RationalityEvaluation();
+            RationalityEvaluation rationalityEvaluation;
             if (rationality) {
                 rationalityEvaluation = this.getRationalityEvaluation(courseOutlineId);
+                result.setRationalityEvaluation(rationalityEvaluation);
             }
-            result.setRationalityEvaluation(rationalityEvaluation);
         }
         result.setCourseOutlineId(courseOutlineId);
-        result.setId(this.saveReport(result));
         return result;
     }
 
@@ -176,6 +179,7 @@ public class ObeCourseOutlineAuditReportServiceImpl extends ServiceImpl<ObeCours
         if (Objects.isNull(obeCourseOutline)) {
             throw ExceptionResultEnum.ERROR.exception("未找到课程大纲");
         }
+
         Long weightSettingSign = obeCourseOutline.getWeightSettingSign();
         CourseBasicInfo courseBasicInfo = auditReport.getCourseBasicInfo();
         CourseTargetInfo courseTargetInfo = auditReport.getCourseTargetInfo();
@@ -193,8 +197,12 @@ public class ObeCourseOutlineAuditReportServiceImpl extends ServiceImpl<ObeCours
             }
         }
 
+        Long id = null;
+        ObeCourseOutlineAuditReport dbReport = this.getOne(new QueryWrapper<ObeCourseOutlineAuditReport>().lambda().eq(ObeCourseOutlineAuditReport::getCourseOutlineId, courseOutlineId).last(SystemConstant.LIMIT1));
+        if (Objects.nonNull(dbReport)){
+            id = dbReport.getId();
+        }
         ObeCourseOutlineAuditReport obeCourseOutlineAuditReport = new ObeCourseOutlineAuditReport();
-        Long id = auditReport.getId();
         if (Objects.isNull(id)) {
             // 新增
             id = SystemConstant.getDbUuid();