From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/bmo/questionAnswer/impl/GetQuestionAnswerBMOImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/questionAnswer/impl/GetQuestionAnswerBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/questionAnswer/impl/GetQuestionAnswerBMOImpl.java
old mode 100644
new mode 100755
index 721b76c..250fa8c
--- a/service-user/src/main/java/com/java110/user/bmo/questionAnswer/impl/GetQuestionAnswerBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/questionAnswer/impl/GetQuestionAnswerBMOImpl.java
@@ -1,6 +1,8 @@
package com.java110.user.bmo.questionAnswer.impl;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.user.IQuestionAnswerInnerServiceSMO;
import com.java110.user.bmo.questionAnswer.IGetQuestionAnswerBMO;
import com.java110.vo.ResultVo;
@@ -18,27 +20,37 @@
@Autowired
private IQuestionAnswerInnerServiceSMO questionAnswerInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
/**
* @param questionAnswerDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public ResponseEntity<String> get(QuestionAnswerDto questionAnswerDto) {
-
-
int count = questionAnswerInnerServiceSMOImpl.queryQuestionAnswersCount(questionAnswerDto);
-
- List<QuestionAnswerDto> questionAnswerDtos = null;
+ List<QuestionAnswerDto> questionAnswerDtos = new ArrayList<>();
if (count > 0) {
- questionAnswerDtos = questionAnswerInnerServiceSMOImpl.queryQuestionAnswers(questionAnswerDto);
+ List<QuestionAnswerDto> questionAnswers = questionAnswerInnerServiceSMOImpl.queryQuestionAnswers(questionAnswerDto);
+ for (QuestionAnswerDto questionAnswer : questionAnswers) {
+ List<String> fileUrls = new ArrayList<>();
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(questionAnswer.getQaId());
+ //鏌ヨ鏂囦欢琛�
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ for (FileRelDto fileRel : fileRelDtos) {
+ fileUrls.add(fileRel.getFileRealName());
+ }
+ }
+ questionAnswer.setFileUrls(fileUrls);
+ questionAnswerDtos.add(questionAnswer);
+ }
} else {
questionAnswerDtos = new ArrayList<>();
}
-
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) questionAnswerDto.getRow()), count, questionAnswerDtos);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
return responseEntity;
}
-
}
--
Gitblit v1.8.0