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..e0352ee4 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 @@ -935,20 +935,20 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve // 获取当前系统时间 bo.setMonthTime(getDateTime().getMonthTime()); //查询重点企业 - if(bo.getEnterpriseNumber()== null || bo.getEnterpriseNumber().equals("")){ + //if(bo.getEnterpriseNumber()== null || bo.getEnterpriseNumber().equals("")){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardEnterpriseCheck::getIsDelete, "0"); queryWrapper.eq(DashboardEnterpriseCheck::getStatYear, getDateTime().getYear()); queryWrapper.eq(DashboardEnterpriseCheck::getStatMonth, getDateTime().getMonth()); + queryWrapper.eq(bo.getEnterpriseNumber()!=null,DashboardEnterpriseCheck::getEnterpriseNumber,bo.getEnterpriseNumber()); queryWrapper.orderByDesc(DashboardEnterpriseCheck::getXzzfzs); queryWrapper.last("LIMIT 1"); DashboardEnterpriseCheck entity = dashboardEnterpriseCheckMapper.selectOne(queryWrapper); bo.setEnterpriseNumber(entity.getEnterpriseNumber()); - vo.setEnterpriseNumber(entity.getEnterpriseNumber()); vo.setEnterpriseName(entity.getEnterpriseName()); vo.setEnterpriseAddress(entity.getEnterpriseAddress()); - } + //} // 锁定基准月份:TbHbUtils.calculate 内部会通过 lambda 反复执行 bo.setMonthTime(...), // 会导致 bo.monthTime 被污染,后续 calculate 的基准月以及趋势/明细查询都会取到错误月份。