|
@@ -32,13 +32,21 @@ public class RequestBase implements Serializable {
|
|
if(StringUtils.isBlank(startTime) && timeList != null && timeList.size() >0){
|
|
if(StringUtils.isBlank(startTime) && timeList != null && timeList.size() >0){
|
|
return DateUtil.getStartTime(timeList.get(0));
|
|
return DateUtil.getStartTime(timeList.get(0));
|
|
}
|
|
}
|
|
- return startTime +" 00:00:00";
|
|
|
|
|
|
+ if(StringUtils.isNotBlank(startTime)){
|
|
|
|
+
|
|
|
|
+ return startTime +" 00:00:00";
|
|
|
|
+ }
|
|
|
|
+ return startTime;
|
|
}
|
|
}
|
|
|
|
|
|
public String getEndTime() {
|
|
public String getEndTime() {
|
|
if(StringUtils.isBlank(endTime) && timeList != null && timeList.size() >1){
|
|
if(StringUtils.isBlank(endTime) && timeList != null && timeList.size() >1){
|
|
return DateUtil.getEndTime(timeList.get(1));
|
|
return DateUtil.getEndTime(timeList.get(1));
|
|
}
|
|
}
|
|
- return endTime +" 23:59:59";
|
|
|
|
|
|
+ if(StringUtils.isNotBlank(endTime)){
|
|
|
|
+
|
|
|
|
+ return endTime +" 00:00:00";
|
|
|
|
+ }
|
|
|
|
+ return endTime;
|
|
}
|
|
}
|
|
}
|
|
}
|