diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index adeb5eae2a..6614b7002a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2847,9 +2847,9 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { @@ -2862,17 +2862,27 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { if (cate.getCategoryCode().equals(k)){ v.forEach(l -> { - if (l.getCreatedTime().getTime() < end && l.getCreatedTime().getTime() >= start){ + if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){ cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); } }); @@ -2912,8 +2922,6 @@ public class ProjectServiceImpl extends BaseServiceImpl