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 e0352ee4..4c16c55d 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 @@ -854,14 +854,20 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardCheckRegisterDomain::getIsDelete, "0"); + queryWrapper.eq(DashboardCheckRegisterDomain::getYear, getDateTime().getYear()); + queryWrapper.eq(DashboardCheckRegisterDomain::getMonth,getDateTime().getMonth()); List list = dashboardCheckRegisterDomainMapper.selectList(queryWrapper); LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getIsDelete, "0"); + queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getYear, getDateTime().getYear()); + queryWrapper1.eq(DashboardCheckRegisterZfajDomain::getMonth,getDateTime().getMonth()); List list1 = dashboardCheckRegisterZfajDomainMapper.selectList(queryWrapper1); LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getIsDelete, "0"); + queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getYear, getDateTime().getYear()); + queryWrapper2.eq(DashboardCheckRegisterZfajdetailsDomain::getMonth,getDateTime().getMonth()); List list2 = dashboardCheckRegisterZfajdetailsDomainMapper.selectList(queryWrapper2); Map map = new HashMap<>(); map.put("domainOverList", list); @@ -945,9 +951,12 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve queryWrapper.last("LIMIT 1"); DashboardEnterpriseCheck entity = dashboardEnterpriseCheckMapper.selectOne(queryWrapper); - bo.setEnterpriseNumber(entity.getEnterpriseNumber()); - vo.setEnterpriseName(entity.getEnterpriseName()); - vo.setEnterpriseAddress(entity.getEnterpriseAddress()); + if(entity!=null){ + bo.setEnterpriseNumber(entity.getEnterpriseNumber()); + vo.setEnterpriseName(entity.getEnterpriseName()); + vo.setEnterpriseAddress(entity.getEnterpriseAddress()); + } + //} // 锁定基准月份:TbHbUtils.calculate 内部会通过 lambda 反复执行 bo.setMonthTime(...),