From 4a8bf051e94ef9f8d30445de44107f8cd1f96dd8 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Thu, 13 Feb 2025 11:07:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E7=9B=B8=E5=85=B3=E5=BE=97=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/vo/appraise/StudentReportVo.java | 2 ++ .../service/impl/EvaluationServiceImpl.java | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/teammodel/model/vo/appraise/StudentReportVo.java b/src/main/java/cn/teammodel/model/vo/appraise/StudentReportVo.java index 67ed796..cdd60a8 100644 --- a/src/main/java/cn/teammodel/model/vo/appraise/StudentReportVo.java +++ b/src/main/java/cn/teammodel/model/vo/appraise/StudentReportVo.java @@ -31,6 +31,8 @@ public class StudentReportVo { @ApiModelProperty("学生表扬总数") private Integer praiseCount; + @ApiModelProperty("学生批评总数") + private Integer criticizeCount; @ApiModelProperty("学生总分") private Integer score; diff --git a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java index 912b06a..6c1cb56 100644 --- a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java +++ b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java @@ -401,7 +401,7 @@ public class EvaluationServiceImpl implements EvaluationService { record.setAcademicYearId(academicYearId); record.setPraiseCount(appraiseTreeNode.isPraise() ? 1 : 0); record.setCriticizeCount(appraiseTreeNode.isPraise() ? 0 : 1); - record.setScore(ObjectUtils.isEmpty(appraiseTreeNode.getScore()) ? 0 : appraiseTreeNode.getScore()); + record.setScore(appraiseTreeNode.isPraise() ? 1 : 0); record.setNodes(items); record.setCode(String.format(PK.PK_APPRAISE_RECORD, schoolId)); appraiseRecordRepository.save(record); @@ -486,8 +486,8 @@ public class EvaluationServiceImpl implements EvaluationService { public List Reports(ReportDto reportDto) { // 获取当前登录用户和学校信息 - User user = SecurityUtil.getLoginUser(); - String schoolId = user.getSchoolId(); + //User user = SecurityUtil.getLoginUser(); + String schoolId = "hbcn"; // 获取学生 ID 列表 List studentIds = reportDto.getIds(); @@ -577,6 +577,8 @@ public class EvaluationServiceImpl implements EvaluationService { Map criticalDistribution = StudentReportVo.ofFiveEducation(); List records = Collections.emptyList(); int praiseCount = 0; + int criticizeCount = 0; + int score = 0; float beyondPercent = 0.0f; AchievementRule curAchievement = rules.get(rules.size() - 1); // 默认使用最低成就规则 int n = 1; @@ -608,6 +610,8 @@ public class EvaluationServiceImpl implements EvaluationService { // 计算学生排名 praiseCount = appraiseRecord.getPraiseCount(); + criticizeCount = appraiseRecord.getCriticizeCount(); + score = appraiseRecord.getScore(); int greaterCount = appraiseRecordRepository.findClassRecord(String.format(PK.PK_APPRAISE_RECORD, schoolId), academicYearId, classId, praiseCount); int stuInClassCount = classStudentCountMap.get(classId); beyondPercent = (float) (stuInClassCount - greaterCount) / stuInClassCount; @@ -653,7 +657,8 @@ public class EvaluationServiceImpl implements EvaluationService { .studentId(studentId) .className(student.getClassId()) // 假设班级名可以从学生信息中获取 .praiseCount(praiseCount) - .score(appraiseRecordOpt.isPresent() ? appraiseRecordOpt.get().getScore() : 0) // 默认分数为 0 + .criticizeCount(criticizeCount) + .score(score) // 默认分数为 0 .beyondPercent(beyondPercent) .topPraiseTeacher(new StudentReportVo.Teacher(null, null)) // 默认值为 null .topCriticalTeacher(new StudentReportVo.Teacher(null, null)) // 默认值为 null