修改党组织架构

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<IcPartyMemberEntity> query = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<IcPartyMemberEntity> dangyuanQw = new LambdaQueryWrapper<>();
-        query.likeRight(IcPartyMemberEntity::getAgencyPids, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids()))
+        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("党员");
+        LambdaQueryWrapper<IcPartyMemberEntity> zhongxinhuLqW = new LambdaQueryWrapper<>();
-        dangyuan.setPartyOrgType("7");
+        AgencyInfoCache finalAgencyInfo = agencyInfo;
-        dangyuan.setValue(icPartyMemberDao.selectCount(query));
+        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;
     }