java110
2023-04-24 357f12084dd380a23a1140b4935087bf6878e7c6
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -3,8 +3,8 @@
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;
@@ -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);