From ad398697078b9c341e41d42e88aba82418807e95 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 08:42:42 +0800
Subject: [PATCH] 优化月缴费明细

---
 service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java b/service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java
index 1640f3a..11fcf95 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java
@@ -1,17 +1,7 @@
 package com.java110.report.api;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportOweFee.ReportOweFeeDto;
 import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
-import com.java110.po.reportOweFee.ReportOweFeePo;
-import com.java110.report.bmo.reportOweFee.IDeleteReportOweFeeBMO;
-import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
-import com.java110.report.bmo.reportOweFee.ISaveReportOweFeeBMO;
-import com.java110.report.bmo.reportOweFee.IUpdateReportOweFeeBMO;
 import com.java110.report.bmo.reportQuestionAnswer.IGetReportQuestionAnswerBMO;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +18,6 @@
     private IGetReportQuestionAnswerBMO getReportQuestionAnswerBMOImpl;
 
 
-
     /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
      *
@@ -38,13 +27,23 @@
      * @path /app/reportQuestionAnswer/queryUserQuestionAnswerValue
      */
     @RequestMapping(value = "/queryUserQuestionAnswerValue", method = RequestMethod.GET)
-    public ResponseEntity<String> queryUserQuestionAnswerValue(@RequestParam(value = "communityId") String communityId,
-                                                               @RequestParam(value = "page") int page,
-                                                               @RequestParam(value = "row") int row) {
+    public ResponseEntity<String> queryUserQuestionAnswerValue(
+            @RequestHeader(value = "store-id") String storeId,
+            @RequestParam(value = "communityId") String communityId,
+            @RequestParam(value = "qaType",required = false) String qaType,
+            @RequestParam(value = "startTime",required = false) String startTime,
+            @RequestParam(value = "endTime",required = false) String endTime,
+            @RequestParam(value = "titleId",required = false) String titleId,
+            @RequestParam(value = "page") int page,
+            @RequestParam(value = "row") int row) {
         UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
         userQuestionAnswerValueDto.setPage(page);
         userQuestionAnswerValueDto.setRow(row);
-        userQuestionAnswerValueDto.setObjId(communityId);
+        userQuestionAnswerValueDto.setObjIds(new String[]{storeId, communityId});
+        userQuestionAnswerValueDto.setQaType(qaType);
+        userQuestionAnswerValueDto.setStartTime(startTime);
+        userQuestionAnswerValueDto.setEndTime(endTime);
+        userQuestionAnswerValueDto.setTitleId(titleId);
         return getReportQuestionAnswerBMOImpl.get(userQuestionAnswerValueDto);
     }
 }

--
Gitblit v1.8.0