refactor: 更新学生报告pdf

src/main/java/cn/teammodel/model/vo/appraise/StudentReportVo.java

@@ -23,6 +23,12 @@ public class StudentReportVo {
     @ApiModelProperty("学生名字")
     private String name;
 
+    @ApiModelProperty("学生id")
+    private String studentId;
+
+    @ApiModelProperty("班级名称")
+    private String className;
+
     @ApiModelProperty("学生表扬总数")
     private Integer praiseCount;
 

src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java

@@ -521,7 +521,7 @@ public class EvaluationServiceImpl implements EvaluationService {
         Map<String, Integer> criticalNodeMap = new HashMap<>();
         // 计算当前学生排名在全班次位
         int greaterCount = appraiseRecordRepository.findClassRecord(String.format(PK.PK_APPRAISE_RECORD, schoolId), academicYearId, classId, praiseCount);
-        float beyondPercent = 0;
+        float beyondPercent;
         long currentRank = stuInClassCount -  greaterCount;
         beyondPercent = (float) currentRank / stuInClassCount;
 
@@ -602,6 +602,8 @@ public class EvaluationServiceImpl implements EvaluationService {
 
         return StudentReportVo.builder()
                 .name(student.getName())
+                .studentId(studentId)
+                .className(appraiseRecord.getClassName())
                 .praiseCount(praiseCount)
                 .score(appraiseRecord.getScore())
                 .beyondPercent(beyondPercent)
@@ -636,12 +638,14 @@ public class EvaluationServiceImpl implements EvaluationService {
 
         Map<String, String> data = new HashMap<>();
         data.put("name", reportVo.getName());
+        data.put("studentId", reportVo.getStudentId());
+        data.put("className", reportVo.getClassName());
         data.put("praiseCount", String.valueOf(reportVo.getPraiseCount()));
         data.put("beyondPercent", String.valueOf(reportVo.getBeyondPercent()));
-        data.put("topPraiseTeacher", reportVo.getTopPraiseTeacher().getName());
+        data.put("topPraiseTeacher", StringUtils.isBlank(reportVo.getTopPraiseTeacher().getName()) ? "暂无" : reportVo.getTopPraiseTeacher().getName());
-        data.put("topCriticalTeacher", reportVo.getTopCriticalTeacher().getName());
+        data.put("topCriticalTeacher", StringUtils.isBlank(reportVo.getTopCriticalTeacher().getName()) ? "暂无" : reportVo.getTopCriticalTeacher().getName());
-        data.put("topPraiseNode", reportVo.getTopPraiseNode());
+        data.put("topPraiseNode", StringUtils.isBlank(reportVo.getTopPraiseNode()) ? "暂无" : reportVo.getTopPraiseNode());
-        data.put("topCriticalNode", reportVo.getTopCriticalNode());
+        data.put("topCriticalNode", StringUtils.isBlank(reportVo.getTopCriticalNode()) ? "暂无" : reportVo.getTopCriticalNode());
 
         DefaultPieDataset praiseDistributionDataset = new DefaultPieDataset( );
         praiseDistributionDataset.setValue(FiveEducations.VIRTUE.getName(), reportVo.getPraiseDistribution().get(FiveEducations.VIRTUE.getCode()));