add:fix

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

@@ -24,12 +24,18 @@ public class CourseWeightDto implements Serializable {
     @ApiModelProperty("课程目标名称")
     private String courseTargetName;
 
+    @ApiModelProperty("预期值")
+    private Double expectValue;
+
     @ApiModelProperty("指标点id")
     private Long obeCultureProgramRequirementId;
 
     @ApiModelProperty("指标点名称")
     private String obeCultureProgramRequirementName;
 
+    @ApiModelProperty("父指标点名称")
+    private String parentRequirementName;
+
     @ApiModelProperty("毕业要求指标（评价依据）")
     private List<CourseDimensionDto> dimensionList;
 
@@ -61,6 +67,14 @@ public class CourseWeightDto implements Serializable {
         this.courseTargetName = courseTargetName;
     }
 
+    public Double getExpectValue() {
+        return expectValue;
+    }
+
+    public void setExpectValue(Double expectValue) {
+        this.expectValue = expectValue;
+    }
+
     public Long getObeCultureProgramRequirementId() {
         return obeCultureProgramRequirementId;
     }
@@ -77,6 +91,14 @@ public class CourseWeightDto implements Serializable {
         this.obeCultureProgramRequirementName = obeCultureProgramRequirementName;
     }
 
+    public String getParentRequirementName() {
+        return parentRequirementName;
+    }
+
+    public void setParentRequirementName(String parentRequirementName) {
+        this.parentRequirementName = parentRequirementName;
+    }
+
     public List<CourseDimensionDto> getDimensionList() {
         return dimensionList;
     }
@@ -131,7 +153,8 @@ public class CourseWeightDto implements Serializable {
             return false;
         }
         CourseWeightDto that = (CourseWeightDto) o;
-        return courseTargetId.equals(that.courseTargetId) && obeCultureProgramRequirementId.equals(that.obeCultureProgramRequirementId) && obeCultureProgramRequirementName.equals(that.obeCultureProgramRequirementName);
+        return courseTargetId.equals(that.courseTargetId) && obeCultureProgramRequirementId.equals(that.obeCultureProgramRequirementId) && obeCultureProgramRequirementName.equals(
+                that.obeCultureProgramRequirementName);
     }
 
     @Override

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

@@ -83,12 +83,16 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
             for (ObeCourseTargetResult courseTarget : courseTargetList) {
                 Long targetId = courseTarget.getId();
                 String targetName = courseTarget.getTargetName();
+                Double expectValue = courseTarget.getExpectValue();
                 Long obeCultureProgramRequirementId = courseTarget.getObeCultureProgramRequirementId();
                 ObeCultureProgramRequirement obeCultureProgramRequirement = obeCultureProgramRequirementService.getById(
                         obeCultureProgramRequirementId);
                 if (Objects.isNull(obeCultureProgramRequirement)) {
                     throw ExceptionResultEnum.ERROR.exception("培养方案毕业要求指标点不存在");
                 }
+                // 父指标点
+                ObeCultureProgramRequirement parentRequirement = obeCultureProgramRequirementService.getById(
+                        obeCultureProgramRequirement.getParentId());
 
                 List<CourseDimensionDto> dimensionList = obeCourseRequirementDimensionService.findByOutlineIdAndRequirementId(
                         obeCourseOutlineId, obeCultureProgramRequirementId);
@@ -129,6 +133,7 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
                 CourseWeightDto courseWeightDto = new CourseWeightDto();
                 courseWeightDto.setCourseTargetId(targetId);
                 courseWeightDto.setCourseTargetName(targetName);
+                courseWeightDto.setExpectValue(expectValue);
                 courseWeightDto.setDimensionList(dimensionList);
                 courseWeightDto.analyzeDimensionStr();
                 courseWeightDto.setDegreeRequirement(degreeRequirement);
@@ -138,6 +143,9 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
                 courseWeightDto.analyzeDimensionStr();
                 courseWeightDto.setObeCultureProgramRequirementId(obeCultureProgramRequirementId);
                 courseWeightDto.setObeCultureProgramRequirementName(obeCultureProgramRequirement.getName());
+                if (Objects.nonNull(parentRequirement)) {
+                    courseWeightDto.setParentRequirementName(parentRequirement.getName());
+                }
                 submitForm.add(courseWeightDto);
             }
         }
@@ -217,7 +225,7 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
                 obeCourseWeight.setEnable(enable);
                 obeCourseWeight.setWeight(weight);
                 // 目标分值计算: 3.3.4版本目标分值直接等于权重
-                if (enable){
+                if (enable) {
                     obeCourseWeight.setTargetScore(BigDecimal.valueOf(100));
                 }
                 obeCourseWeight.insertInfo(requestUserId);