From ab6b726b9c780a00f3745613ff824a99696b66ed Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Thu, 13 Feb 2025 10:11:02 +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/entity/appraise/AppraiseRecord.java | 1 + .../service/impl/EvaluationServiceImpl.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/cn/teammodel/model/entity/appraise/AppraiseRecord.java b/src/main/java/cn/teammodel/model/entity/appraise/AppraiseRecord.java index 14ab81c..50617c3 100644 --- a/src/main/java/cn/teammodel/model/entity/appraise/AppraiseRecord.java +++ b/src/main/java/cn/teammodel/model/entity/appraise/AppraiseRecord.java @@ -50,6 +50,7 @@ public class AppraiseRecord extends BaseItem { * 表扬次数 */ private Integer praiseCount; + private Integer criticizeCount; /** * 学生得分 */ diff --git a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java index 144845f..912b06a 100644 --- a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java +++ b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java @@ -314,8 +314,8 @@ public class EvaluationServiceImpl implements EvaluationService { boolean pushParent = appraiseVoteDto.isPushParent(); String targetType = appraiseVoteDto.getTargetType(); String appraiseId = appraiseVoteDto.getAppraiseId(); - User loginUser = SecurityUtil.getLoginUser(); - String schoolId = loginUser.getSchoolId(); +//User loginUser = SecurityUtil.getLoginUser(); + String schoolId = "hbcn"; String classId; String className; String periodId; @@ -376,8 +376,8 @@ public class EvaluationServiceImpl implements EvaluationService { AppraiseRecordItem item = new AppraiseRecordItem(); item.setId(UUID.randomUUID().toString()); item.setAppraiseNode(appraiseTreeNode); - item.setCreator(loginUser.getName()); - item.setCreatorId(loginUser.getId()); + item.setCreator("zz"); + item.setCreatorId("202106001"); item.setCreateTime(Instant.now().toEpochMilli()); // 处理学校与学生的差异 if (targetType.equals(TARGET_CLASS)) { @@ -399,7 +399,8 @@ public class EvaluationServiceImpl implements EvaluationService { record.setAvatar(avatar); record.setGender(gender); record.setAcademicYearId(academicYearId); - record.setPraiseCount(appraiseTreeNode.isPraise() ? 1 : -1); + record.setPraiseCount(appraiseTreeNode.isPraise() ? 1 : 0); + record.setCriticizeCount(appraiseTreeNode.isPraise() ? 0 : 1); record.setScore(ObjectUtils.isEmpty(appraiseTreeNode.getScore()) ? 0 : appraiseTreeNode.getScore()); record.setNodes(items); record.setCode(String.format(PK.PK_APPRAISE_RECORD, schoolId)); @@ -410,10 +411,12 @@ public class EvaluationServiceImpl implements EvaluationService { // 表扬 (待改进不会减少表扬数) if (appraiseTreeNode.isPraise()) { operations.increment("/praiseCount", 1); + }else { + operations.increment("/criticizeCount", 1); } // 加分 - int scoreToPlus = ObjectUtils.isEmpty(appraiseTreeNode.getScore()) ? 0 : appraiseTreeNode.getScore(); - operations.increment("/score", scoreToPlus); + //nt scoreToPlus = ObjectUtils.isEmpty(appraiseTreeNode.getScore()) ? 0 : appraiseTreeNode.getScore(); + operations.increment("/score", appraiseTreeNode.isPraise() ? 1 : -1); // patch doc appraiseRecordRepository.save(record.getId(), PK.buildOf(PK.PK_APPRAISE_RECORD, schoolId), AppraiseRecord.class, operations); }