From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
index ef00491..573b75b 100755
--- a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
-import com.java110.dto.questionAnswerTitle.QuestionAnswerTitleDto;
-import com.java110.dto.questionAnswerTitleValue.QuestionAnswerTitleValueDto;
+import com.java110.dto.questionAnswer.QuestionAnswerTitleDto;
+import com.java110.dto.questionAnswer.QuestionAnswerTitleValueDto;
import com.java110.po.questionAnswer.QuestionAnswerPo;
-import com.java110.po.questionAnswerTitle.QuestionAnswerTitlePo;
-import com.java110.po.questionAnswerTitleValue.QuestionAnswerTitleValuePo;
+import com.java110.po.questionAnswer.QuestionAnswerTitlePo;
+import com.java110.po.questionAnswer.QuestionAnswerTitleValuePo;
import com.java110.user.bmo.questionAnswer.IDeleteQuestionAnswerBMO;
import com.java110.user.bmo.questionAnswer.IGetQuestionAnswerBMO;
import com.java110.user.bmo.questionAnswer.ISaveQuestionAnswerBMO;
@@ -144,16 +144,15 @@
* @path /app/questionAnswer/queryQuestionAnswer
*/
@RequestMapping(value = "/queryQuestionAnswer", method = RequestMethod.GET)
- public ResponseEntity<String> queryQuestionAnswer(
- @RequestHeader(value = "store-id", required = false) String storeId,
- @RequestHeader(value = "user-id", required = false) String userId,
- @RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "objType", required = false) String objType,
- @RequestParam(value = "qaType", required = false) String qaType,
- @RequestParam(value = "qaName", required = false) String qaName,
- @RequestParam(value = "qaId", required = false) String qaId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryQuestionAnswer(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestHeader(value = "user-id", required = false) String userId,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "qaType", required = false) String qaType,
+ @RequestParam(value = "qaName", required = false) String qaName,
+ @RequestParam(value = "qaId", required = false) String qaId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
QuestionAnswerDto questionAnswerDto = new QuestionAnswerDto();
questionAnswerDto.setPage(page);
questionAnswerDto.setRow(row);
@@ -257,15 +256,23 @@
@RequestMapping(value = "/queryQuestionAnswerTitle", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswerTitle(@RequestHeader(value = "store-id", required = false) String storeId,
// @RequestHeader(value = "user-id", required = false) String userId,
+ @RequestParam(value = "titleType", required = false) String titleType,
+ @RequestParam(value = "qaTitle", required = false) String qaTitle,
+ @RequestParam(value = "titleId", required = false) String titleId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType") String objType,
@RequestParam(value = "qaId") String qaId,
+ @RequestParam(value = "objId") String objId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
QuestionAnswerTitleDto questionAnswerTitleDto = new QuestionAnswerTitleDto();
+ questionAnswerTitleDto.setTitleType(titleType);
+ questionAnswerTitleDto.setQaTitle(qaTitle);
+ questionAnswerTitleDto.setTitleId(titleId);
questionAnswerTitleDto.setPage(page);
questionAnswerTitleDto.setRow(row);
questionAnswerTitleDto.setQaId(qaId);
+ questionAnswerTitleDto.setObjId(objId);
//questionAnswerTitleDto.setUserId(userId);
if (!StringUtil.isEmpty(objType)) {
questionAnswerTitleDto.setObjType(objType);
--
Gitblit v1.8.0