|
@@ -1096,7 +1096,7 @@ public class DashboardService extends BaseService {
|
|
// TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
|
|
// TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
|
|
// cdqTimeAndDataDto.setTime(time);
|
|
// cdqTimeAndDataDto.setTime(time);
|
|
if (cdqMap.get(tempDateTime) != null) {
|
|
if (cdqMap.get(tempDateTime) != null) {
|
|
- if (tempDateTime>currentTime){
|
|
|
|
|
|
+ if (tempDateTime>currentTime + Long.parseLong(khPoint)*1000*60*15){
|
|
cdqList.add(null);
|
|
cdqList.add(null);
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
@@ -1289,7 +1289,7 @@ public class DashboardService extends BaseService {
|
|
// TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
|
|
// TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
|
|
// cdqTimeAndDataDto.setTime(time);
|
|
// cdqTimeAndDataDto.setTime(time);
|
|
if (cdqMap.get(tempDateTime) != null) {
|
|
if (cdqMap.get(tempDateTime) != null) {
|
|
- if (tempDateTime>currentTime){
|
|
|
|
|
|
+ if (tempDateTime>currentTime + Long.parseLong(khPoint)*1000*60*15){
|
|
cdqList.add(null);
|
|
cdqList.add(null);
|
|
}
|
|
}
|
|
else{
|
|
else{
|