diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java index 7ce679d8..894427f8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java @@ -42,7 +42,7 @@ public class CimDashboardOverviewController { CimDashboardOverviewVo vo = new CimDashboardOverviewVo(); // 获取当前系统时间 Date time = new Date(System.currentTimeMillis()); - bo.setDayTime(time); + //bo.setDayTime(time); //行政执法 Long xzzfCount = cimDashboardOverviewService.getEnfRegistrationCount(bo); vo.setXzzfs(xzzfCount); @@ -68,7 +68,7 @@ public class CimDashboardOverviewController { CimDashboardOverviewVo vo = new CimDashboardOverviewVo(); // 获取当前系统时间 Date time = new Date(System.currentTimeMillis()); - bo.setDayTime(time); + //bo.setDayTime(time); //单独部门执法 Long ddbmzfCount=cimDashboardOverviewService.getSepDeptLawCount(bo); vo.setDdbmzf(ddbmzfCount); @@ -95,7 +95,7 @@ public class CimDashboardOverviewController { public R> getEnfRegistrationType(CimDashboardOverviewQueryBo bo){ // 获取当前系统时间 Date time = new Date(System.currentTimeMillis()); - bo.setDayTime(time); + //bo.setDayTime(time); List vo= cimDashboardOverviewService.getEnfRegistrationType(bo); return R.ok(vo); } @@ -111,7 +111,7 @@ public class CimDashboardOverviewController { public R> getNonEnfRegistraion(CimDashboardOverviewQueryBo bo){ // 获取当前系统时间 Date time = new Date(System.currentTimeMillis()); - bo.setDayTime(time); + //bo.setDayTime(time); List vo= cimDashboardOverviewService.getNonEnfRegistraion(bo); return R.ok(vo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 447000f6..a859d4ac 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -1077,31 +1077,31 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve // 一季度 list.stream().filter(a -> a.getFirstquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatArea::getFirstquarter)) - .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getFirstquarter(), a.getYear() + "Q1"))); + .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getFirstquarter(), a.getFirstTime()))); list.stream().filter(a -> a.getFirstquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatArea::getFirstquarter)) - .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getFirstquarter(), a.getYear() + "Q1"))); + .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getFirstquarter(), a.getFirstTime()))); // 二季度 list.stream().filter(a -> a.getSecondquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatArea::getSecondquarter)) - .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getSecondquarter(), a.getYear() + "Q2"))); + .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getSecondquarter(), a.getSecondTime()))); list.stream().filter(a -> a.getSecondquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatArea::getSecondquarter)) - .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getSecondquarter(), a.getYear() + "Q2"))); + .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getSecondquarter(), a.getSecondTime()))); // 三季度 list.stream().filter(a -> a.getThirdquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatArea::getThirdquarter)) - .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getThirdquarter(), a.getYear() + "Q3"))); + .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getThirdquarter(), a.getThirdTime()))); list.stream().filter(a -> a.getThirdquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatArea::getThirdquarter)) - .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getThirdquarter(), a.getYear() + "Q3"))); + .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getThirdquarter(), a.getThirdTime()))); // 四季度 list.stream().filter(a -> a.getFourthquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatArea::getFourthquarter)) - .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getFourthquarter(), a.getYear() + "Q4"))); + .ifPresent(a -> highAreas.add(buildAreaResult(a, a.getFourthquarter(), a.getFourthTime()))); list.stream().filter(a -> a.getFourthquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatArea::getFourthquarter)) - .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getFourthquarter(), a.getYear() + "Q4"))); + .ifPresent(a -> lowAreas.add(buildAreaResult(a, a.getFourthquarter(), a.getFourthTime()))); // 高频:按检查次数降序(最大的在第一条) highAreas.sort(Comparator.comparingLong(DashboardTrendStatArea::getJccs).reversed()); @@ -1212,31 +1212,31 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve // 一季度 list.stream().filter(a -> a.getFirstquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatDomain::getFirstquarter)) - .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getFirstquarter(), a.getYear() + "Q1"))); + .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getFirstquarter(), a.getFirstTime()))); list.stream().filter(a -> a.getFirstquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatDomain::getFirstquarter)) - .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getFirstquarter(), a.getYear() + "Q1"))); + .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getFirstquarter(), a.getFirstTime()))); // 二季度 list.stream().filter(a -> a.getSecondquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatDomain::getSecondquarter)) - .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getSecondquarter(), a.getYear() + "Q2"))); + .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getSecondquarter(), a.getSecondTime()))); list.stream().filter(a -> a.getSecondquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatDomain::getSecondquarter)) - .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getSecondquarter(), a.getYear() + "Q2"))); + .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getSecondquarter(), a.getSecondTime()))); // 三季度 list.stream().filter(a -> a.getThirdquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatDomain::getThirdquarter)) - .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getThirdquarter(), a.getYear() + "Q3"))); + .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getThirdquarter(), a.getThirdTime()))); list.stream().filter(a -> a.getThirdquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatDomain::getThirdquarter)) - .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getThirdquarter(), a.getYear() + "Q3"))); + .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getThirdquarter(), a.getThirdTime()))); // 四季度 list.stream().filter(a -> a.getFourthquarter() != null) .max(Comparator.comparingLong(DashboardTrendStatDomain::getFourthquarter)) - .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getFourthquarter(), a.getYear() + "Q4"))); + .ifPresent(a -> highDomains.add(buildDomainResult(a, a.getFourthquarter(), a.getFourthTime()))); list.stream().filter(a -> a.getFourthquarter() != null) .min(Comparator.comparingLong(DashboardTrendStatDomain::getFourthquarter)) - .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getFourthquarter(), a.getYear() + "Q4"))); + .ifPresent(a -> lowDomains.add(buildDomainResult(a, a.getFourthquarter(), a.getFourthTime()))); // 高频:按检查次数降序(最大的在第一条) highDomains.sort(Comparator.comparingLong(DashboardTrendStatDomain::getJccs).reversed());