From 2e02b0b5618e1bd1df30b358d0572b5fc19702f7 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 1 Mar 2024 15:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YiFengScreenServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java index a80ebdbcac..32570851f9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java @@ -92,17 +92,26 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR }); // 党员 - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.likeRight(IcPartyMemberEntity::getAgencyPids, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())) + LambdaQueryWrapper dangyuanQw = new LambdaQueryWrapper<>(); + dangyuanQw.likeRight(IcPartyMemberEntity::getAgencyPids, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())) .or() .eq(IcPartyMemberEntity::getAgencyId, agencyId); + YiFengScreenPartyOrgCategoryResultDTO dangyuanDto = new YiFengScreenPartyOrgCategoryResultDTO(); + dangyuanDto.setName("党员"); + dangyuanDto.setPartyOrgType("7"); + dangyuanDto.setValue(icPartyMemberDao.selectCount(dangyuanQw)); - YiFengScreenPartyOrgCategoryResultDTO dangyuan = new YiFengScreenPartyOrgCategoryResultDTO(); - dangyuan.setName("党员"); - dangyuan.setPartyOrgType("7"); - dangyuan.setValue(icPartyMemberDao.selectCount(query)); - + // 党员 + LambdaQueryWrapper zhongxinhuLqW = new LambdaQueryWrapper<>(); + AgencyInfoCache finalAgencyInfo = agencyInfo; + zhongxinhuLqW.eq(IcPartyMemberEntity::getIsDyzxh,"1").and(warpp->warpp.likeRight(IcPartyMemberEntity::getAgencyPids, PidUtils.convertPid2OrgIdPath(agencyId, finalAgencyInfo.getPids())) + .or() + .eq(IcPartyMemberEntity::getAgencyId, agencyId)); + YiFengScreenPartyOrgCategoryResultDTO zhongxinhuDto = new YiFengScreenPartyOrgCategoryResultDTO(); + zhongxinhuDto.setName("党员中心户"); + zhongxinhuDto.setPartyOrgType("7"); + zhongxinhuDto.setValue(icPartyMemberDao.selectCount(zhongxinhuLqW)); return l; }