From 1024666b99a24bd7d5e4dc442d6b0c0319fa2f29 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 22:56:48 +0800
Subject: [PATCH] 1、优化细节性问题2、优化采购细节问题

---
 service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 11fcf95..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,7 +29,7 @@
      */
     @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,
@@ -42,7 +43,9 @@
         userQuestionAnswerValueDto.setObjIds(new String[]{storeId, communityId});
         userQuestionAnswerValueDto.setQaType(qaType);
         userQuestionAnswerValueDto.setStartTime(startTime);
-        userQuestionAnswerValueDto.setEndTime(endTime);
+        if(!StringUtil.isEmpty(endTime)){
+            userQuestionAnswerValueDto.setEndTime(endTime+" 23:59:59");
+        }
         userQuestionAnswerValueDto.setTitleId(titleId);
         return getReportQuestionAnswerBMOImpl.get(userQuestionAnswerValueDto);
     }

--
Gitblit v1.8.0