报表时间bug修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -160,16 +160,17 @@ public class ReportServiceImpl implements ReportService {
      * @param reportReq
      */
     private void setQueryTime(ReportReq reportReq){
-        if(!ObjectUtils.isEmpty(reportReq) &&
-                null == reportReq.getEndTime() &&
-                null == reportReq.getBeginTime() &&
-                !ObjectUtils.isEmpty(reportReq.getValue())){
-            Map<String, String> timestamp = getTimestamp(reportReq.getValue());
-            reportReq.setBeginTime( timestamp.get("beginDate"));
-            reportReq.setEndTime( timestamp.get("endDate"));
-        }else {
-            reportReq.setBeginTime(reportReq.getBeginTime() + " 00:00:00");
-            reportReq.setEndTime(reportReq.getEndTime() + " 23:59:59");
+        if (!ObjectUtils.isEmpty(reportReq)){
+            if (null != reportReq.getEndTime() && null != reportReq.getBeginTime()){
+                reportReq.setBeginTime(reportReq.getBeginTime() + " 00:00:00");
+                reportReq.setEndTime(reportReq.getEndTime() + " 23:59:59");
+                return;
+            }
+            if (!ObjectUtils.isEmpty(reportReq.getValue())){
+                Map<String, String> timestamp = getTimestamp(reportReq.getValue());
+                reportReq.setBeginTime( timestamp.get("beginDate"));
+                reportReq.setEndTime( timestamp.get("endDate"));
+            }
         }
     }