Forráskód Böngészése

修改首页超短期按考核点位展示

xusl 1 éve
szülő
commit
24d63c7e7b

+ 2 - 2
ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/DashboardService.java

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