fix bug

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

@@ -7,6 +7,7 @@ import com.qmth.distributed.print.business.bean.dto.obe.MatrixSubRequirementDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: obe毕业指标点dto
@@ -68,17 +69,19 @@ public class ObeSubRequirementsDto extends CourseTargetWebDto {
         this.scale = matrixSubRequirementDto.getScale();
         this.content = matrixSubRequirementDto.getContent();
         this.subRequirementId = matrixSubRequirementDto.getSubRequirementId();
-        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());
+        if (Objects.nonNull(courseTargetWebDto)) {
+            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) {

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

@@ -280,6 +280,16 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                 //解析平时作业分数图
                 ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = this.calculateUsualScoreByExamStudent(finalScoreResult, usualScoreMap, targetWordMap);
                 finalScoreResult.setUsualScoreDto(reportExamStudentUsualScoreDto);
+                Map<Long, List<ReportExamStudentUsualScoreObjDto>> reportExamStudentUsualScoreDtoScoreMap = reportExamStudentUsualScoreDto.getScoreMap();
+                if (!CollectionUtils.isEmpty(reportExamStudentUsualScoreDtoScoreMap)) {
+                    Map<Long, BigDecimal> map = finalScoreExamStudentTargetMap.get(finalScoreResult.getStudentCode());
+                    reportExamStudentUsualScoreDtoScoreMap.forEach((k, v) -> {
+                        if (!map.containsKey(k)) {
+                            map.put(k, new BigDecimal(0));
+                        }
+                    });
+                    finalScoreExamStudentTargetMap.put(finalScoreResult.getStudentCode(), map);
+                }
                 examStudentList.add(new ReportExamStudentDto(finalScoreResult));
             }
         }