From 21b2dd469cd1aa0fa42d4a29165b0c28126965ee Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 15 Oct 2026 09:53:13 +0800 Subject: [PATCH] =?UTF-8?q?CIM-=E6=9F=A5=E8=AF=A2=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CimDashboardOverviewDataSumSserviceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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(...)，