From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/subjectChoices/service/impl/SubjectChoicesServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/subjectChoices/service/impl/SubjectChoicesServiceImpl.java b/src/main/java/org/springblade/modules/subjectChoices/service/impl/SubjectChoicesServiceImpl.java
index 9502cb9..b7fcea5 100644
--- a/src/main/java/org/springblade/modules/subjectChoices/service/impl/SubjectChoicesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/subjectChoices/service/impl/SubjectChoicesServiceImpl.java
@@ -17,12 +17,17 @@
package org.springblade.modules.subjectChoices.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.modules.answerRecord.entity.AnswerRecordEntity;
+import org.springblade.modules.answerRecord.service.IAnswerRecordService;
import org.springblade.modules.subjectChoices.dto.SubjectChoicesDTO;
import org.springblade.modules.subjectChoices.entity.SubjectChoicesEntity;
import org.springblade.modules.subjectChoices.mapper.SubjectChoicesMapper;
import org.springblade.modules.subjectChoices.service.ISubjectChoicesService;
import org.springblade.modules.subjectChoices.vo.SubjectChoicesVO;
+import org.springblade.modules.subjectOption.vo.SubjectOptionVO;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,7 +43,26 @@
@Override
public IPage<SubjectChoicesVO> selectSubjectChoicesPage(IPage<SubjectChoicesVO> page, SubjectChoicesVO subjectChoices) {
- return page.setRecords(baseMapper.selectSubjectChoicesPage(page, subjectChoices));
+ List<SubjectChoicesVO> subjectChoicesVOS = baseMapper.selectSubjectChoicesPage(page, subjectChoices);
+ IAnswerRecordService bean = SpringUtils.getBean(IAnswerRecordService.class);
+ for (SubjectChoicesVO subjectChoicesVO : subjectChoicesVOS) {
+ List<SubjectOptionVO> subjectOptionList = subjectChoicesVO.getSubjectOptionList();
+ for (SubjectOptionVO subjectOptionVO : subjectOptionList) {
+ AnswerRecordEntity one = bean.getOne(Wrappers.<AnswerRecordEntity>lambdaQuery().
+ eq(AnswerRecordEntity::getAnswerOption, subjectOptionVO.getId())
+ .eq(AnswerRecordEntity::getPropertyId,subjectChoices.getPropertyId()));
+ if (one == null) {
+ continue;
+ }
+ if (one.getSubjectChoicesType().equals(3)) {
+ subjectOptionVO.setNumbers(one.getAnswer());
+ } else {
+ subjectChoicesVO.setChooseId(one.getAnswerOption());
+ break;
+ }
+ }
+ }
+ return page.setRecords(subjectChoicesVOS);
}
/**
--
Gitblit v1.9.3