From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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..3e55c0a 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
@@ -17,8 +17,10 @@
package org.springblade.modules.answerRecord.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.modules.answerRecord.dto.AnswerRecordDTO;
import org.springblade.modules.answerRecord.entity.AnswerRecordEntity;
@@ -75,31 +77,39 @@
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) {
- AnswerRecordDTO answerRecordDTO = new AnswerRecordDTO();
- answerRecordDTO.setPropertyId(choicesVO.getPropertyId());
- answerRecordDTO.setAnswerOption(subjectOptionVO.getId().toString());
- answerRecordDTO.setSubjectChoicesId(choicesVO.getId());
- answerRecordDTO.setSubjectOptionId(subjectOptionVO.getId());
- objects.add(answerRecordDTO);
- bigDecimal = bigDecimal.add(subjectOptionVO.getScore());
+ // 判断选项的id
+ if (subjectOptionVO.getId().equals(choicesVO.getChooseId())) {
+ if (CommonConstant.NUMBER_ZERO.equals(choicesVO.getChoicesType().intValue())) {
+ AnswerRecordDTO answerRecordDTO = new AnswerRecordDTO();
+ answerRecordDTO.setPropertyId(choicesVO.getPropertyId());
+ answerRecordDTO.setAnswerOption(subjectOptionVO.getId());
+ answerRecordDTO.setSubjectChoicesId(choicesVO.getId());
+ answerRecordDTO.setSubjectChoicesType(1);
+ answerRecordDTO.setSubjectOptionId(subjectOptionVO.getId());
+ objects.add(answerRecordDTO);
+ bigDecimal = bigDecimal.add(subjectOptionVO.getScore());
+ break;
+ }
}
- if (subjectOptionVO.getNumbers() != null) {
+ if (CommonConstant.NUMBER_THREE.equals(choicesVO.getChoicesType().intValue())) {
AnswerRecordDTO answerRecordDTO = new AnswerRecordDTO();
answerRecordDTO.setPropertyId(choicesVO.getPropertyId());
- answerRecordDTO.setAnswerOption(subjectOptionVO.getId().toString());
+ answerRecordDTO.setAnswerOption(subjectOptionVO.getId());
answerRecordDTO.setSubjectChoicesId(choicesVO.getId());
answerRecordDTO.setAnswer(subjectOptionVO.getNumbers());
answerRecordDTO.setSubjectOptionId(subjectOptionVO.getId());
+ answerRecordDTO.setSubjectChoicesType(3);
objects.add(answerRecordDTO);
BigDecimal multiply = BigDecimal.valueOf(subjectOptionVO.getNumbers()).multiply(subjectOptionVO.getScore());
bigDecimal = bigDecimal.subtract(multiply);
@@ -126,6 +136,7 @@
} else if (subjectChoicesVO.get(0).getSubclassName().equals("违法违规行为惩戒")) {
one.setLllegalAndIrregularScore(bigDecimal);
}
+ // 计算总分
BigDecimal add = one.getBaseInfoScore()
.add(one.getOperateinfoScore())
.add(one.getOperateinfoScore())
@@ -134,10 +145,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