From 65c2b4299b16b4715fd07df68e03aa2161374ba0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Feb 2024 11:28:09 +0800
Subject: [PATCH] 物业评定bug修复
---
src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 b1f3c29..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;
@@ -86,22 +88,28 @@
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);
--
Gitblit v1.9.3