From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/answerRecord/service/impl/AnswerRecordServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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..be1db66 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;
@@ -74,7 +76,7 @@
@Override
public Boolean saveAnswer(List<SubjectChoicesVO> subjectChoicesVO) {
BigDecimal bigDecimal = BigDecimal.valueOf(0);
- List<AnswerRecordEntity> objects = new ArrayList<>();
+ List<AnswerRecordEntity> answerRecordEntityList = new ArrayList<>();
// 遍历题目和选项
for (SubjectChoicesVO choicesVO : subjectChoicesVO) {
List<SubjectOptionVO> subjectOptionList = choicesVO.getSubjectOptionList();
@@ -86,23 +88,29 @@
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());
+ answerRecordEntityList.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());
- objects.add(answerRecordDTO);
+ answerRecordDTO.setSubjectChoicesType(3);
+ answerRecordEntityList.add(answerRecordDTO);
BigDecimal multiply = BigDecimal.valueOf(subjectOptionVO.getNumbers()).multiply(subjectOptionVO.getScore());
bigDecimal = bigDecimal.subtract(multiply);
}
@@ -121,7 +129,9 @@
one.setPartyBuildingInfoScore(bigDecimal);
bean.update(Wrappers.<PropertyCompanyEntity>lambdaUpdate().set(PropertyCompanyEntity::getPartyBuildingInfoScore, bigDecimal)
.eq(PropertyCompanyEntity::getId, subjectChoicesVO.get(0).getPropertyId()));
- } else if (subjectChoicesVO.get(0).getSubclassName().equals("企业良好行为")) {
+ } else if (subjectChoicesVO.get(0).getSubclassName().equals("街道社区")) {
+ one.setStreetScore(bigDecimal);
+ }else if (subjectChoicesVO.get(0).getSubclassName().equals("企业良好行为")) {
one.setGoodCorporateScore(bigDecimal);
} else if (subjectChoicesVO.get(0).getSubclassName().equals("项目良好行为")) {
one.setGoodProjectScore(bigDecimal);
@@ -136,10 +146,11 @@
.add(one.getGoodCorporateScore())
.add(one.getGoodProjectScore())
.add(one.getLllegalAndIrregularScore())
- .add(one.getEvaluateScore());
+ .add(one.getEvaluateScore())
+ .add(one.getStreetScore());
one.setAllScore(getAllScore(add));
bean.updateById(one);
- return saveBatch(objects);
+ return saveBatch(answerRecordEntityList);
}
/**
--
Gitblit v1.9.3