diff --git a/src/main/java/com/supervision/police/service/impl/HomepageServiceImpl.java b/src/main/java/com/supervision/police/service/impl/HomepageServiceImpl.java index 5aaa208..c73c5e3 100644 --- a/src/main/java/com/supervision/police/service/impl/HomepageServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/HomepageServiceImpl.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Calendar; import java.util.List; @Slf4j @@ -35,8 +36,9 @@ public class HomepageServiceImpl implements HomepageService { HomepageResultDto homepageResultDto = new HomepageResultDto(); // 只统计非逻辑删除的案件 List<ModelCase> modelCaseList = modelCaseService.list(new QueryWrapper<ModelCase>().eq("data_status", 1)); - int currentMonthCaseNumber = (int) modelCaseList.stream().filter(modelCase -> modelCase.getCreateTime().getMonthValue() == 9).count(); - int lastMonthCaseNumber = (int) modelCaseList.stream().filter(modelCase -> modelCase.getCreateTime().getMonthValue() == 8).count(); + Calendar cal = Calendar.getInstance(); + int currentMonthCaseNumber = (int) modelCaseList.stream().filter(modelCase -> modelCase.getCreateTime().getMonthValue() == cal.get(Calendar.MONTH) + 1).count(); + int lastMonthCaseNumber = (int) modelCaseList.stream().filter(modelCase -> modelCase.getCreateTime().getMonthValue() == cal.get(Calendar.MONTH)).count(); homepageResultDto.setCaseNumber(modelCaseList.size()); homepageResultDto.setCaseActorNumber((int) casePersonService.count(new QueryWrapper<CasePerson>().in("role_code", 1, 2))); homepageResultDto.setMonthlyNewCaseNumber(currentMonthCaseNumber);