zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cim-修改

dev
niujiyi 2 weeks ago
parent
9c5a3cc154
commit
3248f8e9b8
2 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java
  2. 32
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java

8
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java
View File

@ -42,7 +42,7 @@ public class CimDashboardOverviewController {
CimDashboardOverviewVo vo = new CimDashboardOverviewVo(); CimDashboardOverviewVo vo = new CimDashboardOverviewVo();
// 获取当前系统时间 // 获取当前系统时间
Date time = new Date(System.currentTimeMillis()); Date time = new Date(System.currentTimeMillis());
bo.setDayTime(time); //bo.setDayTime(time);
//行政执法 //行政执法
Long xzzfCount = cimDashboardOverviewService.getEnfRegistrationCount(bo); Long xzzfCount = cimDashboardOverviewService.getEnfRegistrationCount(bo);
vo.setXzzfs(xzzfCount); vo.setXzzfs(xzzfCount);
@ -68,7 +68,7 @@ public class CimDashboardOverviewController {
CimDashboardOverviewVo vo = new CimDashboardOverviewVo(); CimDashboardOverviewVo vo = new CimDashboardOverviewVo();
// 获取当前系统时间 // 获取当前系统时间
Date time = new Date(System.currentTimeMillis()); Date time = new Date(System.currentTimeMillis());
bo.setDayTime(time); //bo.setDayTime(time);
//单独部门执法 //单独部门执法
Long ddbmzfCount=cimDashboardOverviewService.getSepDeptLawCount(bo); Long ddbmzfCount=cimDashboardOverviewService.getSepDeptLawCount(bo);
vo.setDdbmzf(ddbmzfCount); vo.setDdbmzf(ddbmzfCount);
@ -95,7 +95,7 @@ public class CimDashboardOverviewController {
public R<List<CimDashboardOverviewVo>> getEnfRegistrationType(CimDashboardOverviewQueryBo bo){ public R<List<CimDashboardOverviewVo>> getEnfRegistrationType(CimDashboardOverviewQueryBo bo){
// 获取当前系统时间 // 获取当前系统时间
Date time = new Date(System.currentTimeMillis()); Date time = new Date(System.currentTimeMillis());
bo.setDayTime(time); //bo.setDayTime(time);
List<CimDashboardOverviewVo> vo= cimDashboardOverviewService.getEnfRegistrationType(bo); List<CimDashboardOverviewVo> vo= cimDashboardOverviewService.getEnfRegistrationType(bo);
return R.ok(vo); return R.ok(vo);
} }
@ -111,7 +111,7 @@ public class CimDashboardOverviewController {
public R<List<CimDashboardOverviewVo>> getNonEnfRegistraion(CimDashboardOverviewQueryBo bo){ public R<List<CimDashboardOverviewVo>> getNonEnfRegistraion(CimDashboardOverviewQueryBo bo){
// 获取当前系统时间 // 获取当前系统时间
Date time = new Date(System.currentTimeMillis()); Date time = new Date(System.currentTimeMillis());
bo.setDayTime(time); //bo.setDayTime(time);
List<CimDashboardOverviewVo> vo= cimDashboardOverviewService.getNonEnfRegistraion(bo); List<CimDashboardOverviewVo> vo= cimDashboardOverviewService.getNonEnfRegistraion(bo);
return R.ok(vo); return R.ok(vo);
} }

32
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java
View File

@ -1077,31 +1077,31 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
// 一季度 // 一季度
list.stream().filter(a -> a.getFirstquarter() != null) list.stream().filter(a -> a.getFirstquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatArea::getFirstquarter)) .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) list.stream().filter(a -> a.getFirstquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatArea::getFirstquarter)) .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) list.stream().filter(a -> a.getSecondquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatArea::getSecondquarter)) .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) list.stream().filter(a -> a.getSecondquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatArea::getSecondquarter)) .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) list.stream().filter(a -> a.getThirdquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatArea::getThirdquarter)) .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) list.stream().filter(a -> a.getThirdquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatArea::getThirdquarter)) .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) list.stream().filter(a -> a.getFourthquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatArea::getFourthquarter)) .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) list.stream().filter(a -> a.getFourthquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatArea::getFourthquarter)) .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()); highAreas.sort(Comparator.comparingLong(DashboardTrendStatArea::getJccs).reversed());
@ -1212,31 +1212,31 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
// 一季度 // 一季度
list.stream().filter(a -> a.getFirstquarter() != null) list.stream().filter(a -> a.getFirstquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatDomain::getFirstquarter)) .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) list.stream().filter(a -> a.getFirstquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatDomain::getFirstquarter)) .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) list.stream().filter(a -> a.getSecondquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatDomain::getSecondquarter)) .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) list.stream().filter(a -> a.getSecondquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatDomain::getSecondquarter)) .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) list.stream().filter(a -> a.getThirdquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatDomain::getThirdquarter)) .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) list.stream().filter(a -> a.getThirdquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatDomain::getThirdquarter)) .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) list.stream().filter(a -> a.getFourthquarter() != null)
.max(Comparator.comparingLong(DashboardTrendStatDomain::getFourthquarter)) .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) list.stream().filter(a -> a.getFourthquarter() != null)
.min(Comparator.comparingLong(DashboardTrendStatDomain::getFourthquarter)) .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()); highDomains.sort(Comparator.comparingLong(DashboardTrendStatDomain::getJccs).reversed());

Write Preview
Loading…
Cancel
Save