From cddcf22a61489ee9c2dfee169d817ccd66f95430 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 02:23:43 +0800
Subject: [PATCH] 优化代码

---
 service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 5b0338f..f6a6fe0 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
@@ -2,6 +2,7 @@
 
 import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
 import com.java110.report.bmo.reportQuestionAnswer.IGetReportQuestionAnswerBMO;
+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,11 +29,12 @@
      */
     @RequestMapping(value = "/queryUserQuestionAnswerValue", method = RequestMethod.GET)
     public ResponseEntity<String> queryUserQuestionAnswerValue(
-            @RequestHeader(value = "store-id") String storeId,
+            @RequestHeader(value = "store-id",required = false) 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();
@@ -40,6 +42,11 @@
         userQuestionAnswerValueDto.setRow(row);
         userQuestionAnswerValueDto.setObjIds(new String[]{storeId, communityId});
         userQuestionAnswerValueDto.setQaType(qaType);
+        userQuestionAnswerValueDto.setStartTime(startTime);
+        if(!StringUtil.isEmpty(endTime)){
+            userQuestionAnswerValueDto.setEndTime(endTime+" 23:59:59");
+        }
+        userQuestionAnswerValueDto.setTitleId(titleId);
         return getReportQuestionAnswerBMOImpl.get(userQuestionAnswerValueDto);
     }
 }

--
Gitblit v1.8.0