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 7ce215cc..74b3b966 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 @@ -174,8 +174,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve List list2=cimDashboardOverviewMapper.getHighCheckAreaenfRegistraionRanking(bo); List list3=cimDashboardOverviewMapper.getHighCheckEnt(bo); - - // 1. 高频检查区域:VO(code/name/number) → 实体(areaCode/areaName/gpjcqy) List areaList = new ArrayList<>(); if (list != null) { @@ -270,9 +268,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve @Override public Map getHighCheckAreaMonthDataSumMap() { - - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardHighCheckArea::getLevel, 2); queryWrapper.eq(DashboardHighCheckArea::getIsDelete, "0"); @@ -322,8 +317,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve List list1 = cimDashboardOverviewMapper.getHighCheckFieldUnionNoCount(bo); List list2 = cimDashboardOverviewMapper.getHighCheckEntDetail(bo); - - // 1. 领域高频检查次数 List frequencyList = new ArrayList<>(); if (list != null) { @@ -380,7 +373,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve } } - //新增数据到数据汇总表 if (!frequencyList.isEmpty()) { dashboardHighCheckDomainMapper.insertBatch(frequencyList); @@ -489,8 +481,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve vo.setXzqzajsTb(xzqzajsTbHb.tb); vo.setXzqzajsHb(xzqzajsTbHb.hb); - - //添加数据到数据汇总表 insertCheckRegiserData(vo); getCheckRegisterAreaMonthDataSumList(); @@ -563,9 +553,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return */ public Boolean insertCheckRegiserData(CimDashboardOverviewVo vo){ - //获取时间 - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -1); //添加数据到大屏总览数据汇总表 DashboardCheckRegisterArea add = new DashboardCheckRegisterArea(); @@ -694,8 +681,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve vo.setXzqzajsTb(xzqzajsTbHb.tb); vo.setXzqzajsHb(xzqzajsTbHb.hb); - - //添加数据到数据汇总表 insertFieldCheckRegiserData(vo); getCheckRegisterFieldMonthDataSumList(); @@ -709,6 +694,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return */ public Boolean getCheckRegisterFieldMonthDataSumList() { + // 获取当前系统时间 CimDashboardOverviewQueryBo bo=getDateTime() ; List list =cimDashboardOverviewMapper.getFieldEnfRegistrationAndCaseCount(bo); @@ -765,7 +751,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve */ public Boolean insertFieldCheckRegiserData(CimDashboardOverviewVo vo){ - //添加数据到大屏总览数据汇总表 DashboardCheckRegisterDomain add = new DashboardCheckRegisterDomain(); add.setLyid(vo.getDomainId()); @@ -938,6 +923,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve */ @Override public Boolean getTrendAreaMonthDataSum() { + CimDashboardOverviewQueryBo bo=getDateTime() ; List list= cimDashboardOverviewMapper.getQuarterlyRegionList(bo); @@ -1050,6 +1036,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return 副本对象(jccs、quarter 已赋值) */ private DashboardTrendStatArea buildAreaResult(DashboardTrendStatArea source, Long jccs, String quarter) { + DashboardTrendStatArea target = new DashboardTrendStatArea(); target.setYear(source.getYear()); target.setQuarter(quarter); @@ -1067,6 +1054,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve */ @Override public Boolean getTrendFieldMonthDataSum() { + CimDashboardOverviewQueryBo bo=getDateTime() ; List list= cimDashboardOverviewMapper.getDomainQuarterList(bo); // 1. 领域季度