课程专业达成度

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseWeightDto.java

@@ -4,8 +4,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -13,7 +15,7 @@ import java.util.stream.Collectors;
  * @Author: CaoZixuan
  * @Date: 2024-03-01
  */
-public class CourseWeightDto {
+public class CourseWeightDto implements Serializable {
 
     @ApiModelProperty("课程目标id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -119,4 +121,21 @@ public class CourseWeightDto {
     public void analyzeDimensionStr() {
         dimensionStr = dimensionList.stream().map(e -> String.format("%s(%s)", e.getName(), e.getCode())).collect(Collectors.joining(","));
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CourseWeightDto that = (CourseWeightDto) o;
+        return courseTargetId.equals(that.courseTargetId) && obeCultureProgramRequirementId.equals(that.obeCultureProgramRequirementId) && obeCultureProgramRequirementName.equals(that.obeCultureProgramRequirementName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(courseTargetId, obeCultureProgramRequirementId, obeCultureProgramRequirementName);
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ObeCourseRequirementDto.java

@@ -0,0 +1,74 @@
+package com.qmth.distributed.print.business.bean.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.distributed.print.business.bean.dto.obe.CourseRequirementMatrixDto;
+import com.qmth.distributed.print.business.bean.dto.obe.MatrixRequirementDto;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: obe课程毕业指标dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/6/12
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ObeCourseRequirementDto implements Serializable {
+
+    @ApiModelProperty(value = "课程编码")
+    private String courseCode;
+
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
+
+    @ApiModelProperty(value = "课程毕业指标达成值")
+    private BigDecimal matrixDegree;
+
+    @ApiModelProperty(value = "课程毕业指标达成值")
+    private List<ObeRequirementDto> obeRequirements;
+
+    public ObeCourseRequirementDto(){
+
+    }
+
+    public ObeCourseRequirementDto(CourseRequirementMatrixDto courseRequirementMatrixDto){
+        this.courseCode = courseRequirementMatrixDto.getCourseCode();
+        this.courseName = courseRequirementMatrixDto.getCourseName();
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public BigDecimal getMatrixDegree() {
+        return matrixDegree;
+    }
+
+    public void setMatrixDegree(BigDecimal matrixDegree) {
+        this.matrixDegree = matrixDegree;
+    }
+
+    public List<ObeRequirementDto> getObeRequirements() {
+        return obeRequirements;
+    }
+
+    public void setObeRequirements(List<ObeRequirementDto> obeRequirements) {
+        this.obeRequirements = obeRequirements;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ObeRequirementDto.java

@@ -0,0 +1,56 @@
+package com.qmth.distributed.print.business.bean.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.distributed.print.business.bean.dto.obe.MatrixRequirementDto;
+import com.qmth.distributed.print.business.bean.dto.obe.MatrixSubRequirementDto;
+import com.qmth.distributed.print.business.entity.BasicProfessional;
+import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: obe毕业指标dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/6/12
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ObeRequirementDto extends MatrixRequirementDto implements Serializable {
+
+    @ApiModelProperty(value = "毕业指标达成值")
+    private BigDecimal matrixDegree;
+
+    @ApiModelProperty(value = "毕业指标点集合")
+    private List<ObeSubRequirementsDto> obeSubRequirements;
+
+    public ObeRequirementDto() {
+
+    }
+
+    public ObeRequirementDto(MatrixRequirementDto matrixRequirementDto) {
+        setId(matrixRequirementDto.getId());
+        setName(matrixRequirementDto.getName());
+        setContent(matrixRequirementDto.getContent());
+        setExpectValue(matrixRequirementDto.getExpectValue());
+    }
+
+    public BigDecimal getMatrixDegree() {
+        return matrixDegree;
+    }
+
+    public void setMatrixDegree(BigDecimal matrixDegree) {
+        this.matrixDegree = matrixDegree;
+    }
+
+    public List<ObeSubRequirementsDto> getObeSubRequirements() {
+        return obeSubRequirements;
+    }
+
+    public void setObeSubRequirements(List<ObeSubRequirementsDto> obeSubRequirements) {
+        this.obeSubRequirements = obeSubRequirements;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ObeSubRequirementsDto.java

@@ -0,0 +1,109 @@
+package com.qmth.distributed.print.business.bean.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
+import com.qmth.distributed.print.business.bean.dto.obe.MatrixSubRequirementDto;
+import io.swagger.annotations.ApiModelProperty;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: obe毕业指标点dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/2/26
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ObeSubRequirementsDto extends CourseTargetWebDto {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "毕业指标点id")
+    private Long id;
+
+    @ApiModelProperty(value = "毕业指标点名称")
+    private String name;
+
+    @ApiModelProperty(value = "权重")
+    private Double scale;
+
+    @ApiModelProperty(value = "描述")
+    private String content;
+
+    @ApiModelProperty(value = "毕业指标点达成值")
+    private BigDecimal matrixDegree;
+
+    public ObeSubRequirementsDto() {
+
+    }
+
+    public ObeSubRequirementsDto(CourseTargetWebDto courseTargetWebDto, MatrixSubRequirementDto matrixSubRequirementDto) {
+        this.id = matrixSubRequirementDto.getId();
+        this.name = matrixSubRequirementDto.getName();
+        this.scale = matrixSubRequirementDto.getScale();
+        this.content = matrixSubRequirementDto.getContent();
+        setTargetId(courseTargetWebDto.getTargetId());
+        setTargetName(courseTargetWebDto.getTargetName());
+        setGraduationRequirement(courseTargetWebDto.getGraduationRequirement());
+        setGraduationRequirementPoint(courseTargetWebDto.getGraduationRequirementPoint());
+        setTargetSumWeight(courseTargetWebDto.getTargetSumWeight());
+        setDimensionList(courseTargetWebDto.getDimensionList());
+        setEvaluationValue(courseTargetWebDto.getEvaluationValue());
+        setEvaluationList(courseTargetWebDto.getEvaluationList());
+        setDimensionScoreSum(courseTargetWebDto.getDimensionScoreSum());
+        setDimensionPoint(courseTargetWebDto.getDimensionPoint());
+        setFinalScoreQuestionScoreSum(courseTargetWebDto.getFinalScoreQuestionScoreSum());
+    }
+
+    public ObeSubRequirementsDto(MatrixSubRequirementDto matrixSubRequirementDto) {
+        this.id = matrixSubRequirementDto.getId();
+        this.name = matrixSubRequirementDto.getName();
+        this.scale = matrixSubRequirementDto.getScale();
+        this.content = matrixSubRequirementDto.getContent();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getScale() {
+        return scale;
+    }
+
+    public void setScale(Double scale) {
+        this.scale = scale;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public BigDecimal getMatrixDegree() {
+        return matrixDegree;
+    }
+
+    public void setMatrixDegree(BigDecimal matrixDegree) {
+        this.matrixDegree = matrixDegree;
+    }
+}

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

@@ -404,9 +404,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                         }
 //                        BigDecimal targetEvaluationValue = new BigDecimal(targetAvgSumScore).divide(targetSumScore, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
                         courseTargetWebDto.setEvaluationValue(targetEvaluationValue);
-//                        if (targetEvaluationSumValue.compareTo(new BigDecimal(0)) == 0 || targetEvaluationSumValue.compareTo(targetEvaluationValue) == 1) {
-//                            targetEvaluationSumValue = targetEvaluationValue;
-//                        }
+                        if (targetEvaluationSumValue.compareTo(new BigDecimal(0)) == 0 || targetEvaluationSumValue.compareTo(targetEvaluationValue) == 1) {
+                            targetEvaluationSumValue = targetEvaluationValue;
+                        }
                         courseTargetWordDto.setEvaluationValue(targetEvaluationValue);
                     }
                 }