From 99a1086e763ee8be458b8e450f4d36222263ade3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 20 Jan 2024 14:06:03 +0800
Subject: [PATCH] 添加物业公司,新增物业公司账号

---
 src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java b/src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java
index a42861f..b1f3c29 100644
--- a/src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java
@@ -75,13 +75,15 @@
 	public Boolean saveAnswer(List<SubjectChoicesVO> subjectChoicesVO) {
 		BigDecimal bigDecimal = BigDecimal.valueOf(0);
 		List<AnswerRecordEntity> objects = new ArrayList<>();
+		// 遍历题目和选项
 		for (SubjectChoicesVO choicesVO : subjectChoicesVO) {
 			List<SubjectOptionVO> subjectOptionList = choicesVO.getSubjectOptionList();
 			if (choicesVO.getChoicesType().intValue() == 3) {
 				bigDecimal = bigDecimal.add(choicesVO.getScore());
 			}
 			for (SubjectOptionVO subjectOptionVO : subjectOptionList) {
-				boolean update = remove(Wrappers.<AnswerRecordEntity>lambdaQuery()
+				// 删除掉之前保存的记录
+				remove(Wrappers.<AnswerRecordEntity>lambdaQuery()
 					.eq(AnswerRecordEntity::getPropertyId, choicesVO.getPropertyId())
 					.eq(AnswerRecordEntity::getSubjectChoicesId, choicesVO.getId()));
 				if (subjectOptionVO.getIds() != null) {
@@ -126,6 +128,7 @@
 		} else if (subjectChoicesVO.get(0).getSubclassName().equals("违法违规行为惩戒")) {
 			one.setLllegalAndIrregularScore(bigDecimal);
 		}
+		// 计算总分
 		BigDecimal add = one.getBaseInfoScore()
 			.add(one.getOperateinfoScore())
 			.add(one.getOperateinfoScore())
@@ -134,10 +137,26 @@
 			.add(one.getGoodProjectScore())
 			.add(one.getLllegalAndIrregularScore())
 			.add(one.getEvaluateScore());
-		one.setAllScore(add);
+		one.setAllScore(getAllScore(add));
 		bean.updateById(one);
 		return saveBatch(objects);
 	}
 
+	/**
+	 * 判断结果,如果大于100 则设置100 小于/等于0 设置为0
+	 *
+	 * @param allScore
+	 * @return
+	 */
+	private BigDecimal getAllScore(BigDecimal allScore) {
+		if (allScore.compareTo(BigDecimal.valueOf(0)) > 100) {
+			return BigDecimal.valueOf(100);
+		}
+		if (allScore.compareTo(BigDecimal.valueOf(0)) > 0) {
+			return allScore;
+		}
+		return BigDecimal.valueOf(0);
+	}
+
 
 }

--
Gitblit v1.9.3