|
|
|
@ -58,7 +58,6 @@ import com.epmet.dao.*; |
|
|
|
import com.epmet.dto.*; |
|
|
|
import com.epmet.dto.form.*; |
|
|
|
import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; |
|
|
|
import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; |
|
|
|
import com.epmet.dto.result.*; |
|
|
|
import com.epmet.dto.result.demand.IcResiDemandDictDTO; |
|
|
|
import com.epmet.dto.result.demand.OptionDTO; |
|
|
|
@ -74,7 +73,6 @@ import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; |
|
|
|
import com.epmet.opendata.feign.GuardarDatosFeignClient; |
|
|
|
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; |
|
|
|
import com.epmet.service.*; |
|
|
|
import com.epmet.stats.UserHouseStatsResultDTO; |
|
|
|
import com.github.pagehelper.Page; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
@ -183,7 +181,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
@Autowired |
|
|
|
private IcVaccineRelationDao icVaccineRelationDao; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 组织字段，目前用于居民信息动态查询接口。将此条件从conditions中移除，单独生成固定的sql片段 |
|
|
|
*/ |
|
|
|
public static final List<String> ORG_FIELDS = Arrays.asList("AGENCY_IDS", "GRID_IDS", "AGENCY_ID", "GRID_ID"); |
|
|
|
|
|
|
|
private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) { |
|
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
@ -211,6 +212,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); |
|
|
|
icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); |
|
|
|
icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); |
|
|
|
//如果是烟台客户，删除居民时，同时删除死亡数据data_sync_record_death、残疾记录data_sync_record_disability
|
|
|
|
if(CustomerIdConstant.YT_CUSTOMER_ID.equals(formDTO.getCustomerId())){ |
|
|
|
SpringContextUtils.getBean(DataSyncRecordDisabilityService.class).deleteByIcResiUserId(formDTO.getIcResiUserId()); |
|
|
|
SpringContextUtils.getBean(DataSyncRecordDeathService.class).deleteByIcResiUserId(formDTO.getIcResiUserId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -915,36 +921,55 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
List<IcFormResColumnDTO> resultColumns = resultColumnRes.getData(); |
|
|
|
// 查询结果列对应的表:
|
|
|
|
Set<String> resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet()); |
|
|
|
List<String> queryAgencyIdList = formDTO.getConditions().stream() |
|
|
|
.filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()) |
|
|
|
&& CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO))) |
|
|
|
.flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList()); |
|
|
|
|
|
|
|
// List<String> queryAgencyIdList = formDTO.getConditions().stream()
|
|
|
|
// .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_IDS".equals(o.getColumnName())
|
|
|
|
// && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO)))
|
|
|
|
// .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList());
|
|
|
|
|
|
|
|
// 组织和网格单独处理
|
|
|
|
Set<String> queryAgencyIdList = new HashSet<>(); |
|
|
|
Set<String> queryGridIdList = new HashSet<>(); |
|
|
|
|
|
|
|
// 将以下几列单独提出来，组合起来，放入集合，自动去重
|
|
|
|
formDTO.getConditions().stream().forEach(c -> { |
|
|
|
if (IcResiUserConstant.IC_RESI_USER.equals(c.getTableName()) && CollectionUtils.isNotEmpty(c.getColumnValue()) |
|
|
|
&& StringUtils.isNotBlank(c.getColumnValue().get(NumConstant.ZERO))) { |
|
|
|
if ("AGENCY_IDS".equals(c.getColumnName())) { |
|
|
|
queryAgencyIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("GRID_IDS".equals(c.getColumnName())) { |
|
|
|
queryGridIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("AGENCY_ID".equals(c.getColumnName())) { |
|
|
|
queryAgencyIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("GRID_ID".equals(c.getColumnName())) { |
|
|
|
queryGridIdList.addAll(c.getColumnValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
// 移除需要特殊处理的conditions
|
|
|
|
formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && ORG_FIELDS.contains(o.getColumnName())); |
|
|
|
|
|
|
|
//添加数据权限
|
|
|
|
String staffOrgPath; |
|
|
|
String agencyId; |
|
|
|
//如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据
|
|
|
|
if (queryAgencyIdList.isEmpty()){ |
|
|
|
List<String> staffOrgPaths; |
|
|
|
List<String> agencyIds = null; |
|
|
|
//如果查询条件中 没有有居民表的agencyId,则查询该工作人员所属组织的信息
|
|
|
|
if (queryAgencyIdList.isEmpty() && queryGridIdList.isEmpty()){ |
|
|
|
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); |
|
|
|
agencyId = staffInfoCacheResult.getAgencyId(); |
|
|
|
if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { |
|
|
|
staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); |
|
|
|
} else { |
|
|
|
staffOrgPath = staffInfoCacheResult.getAgencyId(); |
|
|
|
} |
|
|
|
agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId()); |
|
|
|
|
|
|
|
String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); |
|
|
|
staffOrgPaths = Arrays.asList(op); |
|
|
|
} else { |
|
|
|
formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())); |
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO)); |
|
|
|
if (agencyInfo == null){ |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败"); |
|
|
|
} |
|
|
|
agencyId = agencyInfo.getId(); |
|
|
|
staffOrgPath = agencyInfo.getPids(); |
|
|
|
if (StringUtils.isBlank(staffOrgPath)){ |
|
|
|
staffOrgPath = agencyId; |
|
|
|
}else{ |
|
|
|
staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId(); |
|
|
|
} |
|
|
|
// 将组织id列表，转化为组织orgIdPath列表
|
|
|
|
staffOrgPaths = queryAgencyIdList.stream().map(agId -> { |
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agId); |
|
|
|
if (agencyInfo == null) { |
|
|
|
String errorMsg = "查询机关单位失败:" + agId; |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|
|
|
} |
|
|
|
return PidUtils.convertPid2OrgIdPath(agId, agencyInfo.getPids()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
// 查询列表展示项需要用到哪些子表
|
|
|
|
Result<List<SubTableJoinDTO>> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1); |
|
|
|
@ -973,14 +998,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(); |
|
|
|
if (null == formDTO.getIsPage() || formDTO.getIsPage()) { |
|
|
|
//分页
|
|
|
|
String finalStaffOrgPath = staffOrgPath; |
|
|
|
List<String> finalStaffOrgPath = staffOrgPaths; |
|
|
|
List<String> finalAgencyIds = agencyIds; |
|
|
|
pageInfo = PageHelper.startPage(formDTO.getPageNo(), |
|
|
|
formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(), |
|
|
|
formDTO.getFormCode(), |
|
|
|
formDTO.getConditions(), |
|
|
|
resultColumns, |
|
|
|
finalSubTables, |
|
|
|
agencyId, finalStaffOrgPath,null, formDTO.getKeyword(), |
|
|
|
finalAgencyIds, |
|
|
|
finalStaffOrgPath, |
|
|
|
queryGridIdList, |
|
|
|
null, |
|
|
|
formDTO.getKeyword(), |
|
|
|
groupByTables)); |
|
|
|
} else { |
|
|
|
List<Map<String, Object>> list = baseDao.selectListResiMap(formDTO.getCustomerId(), |
|
|
|
@ -988,8 +1018,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
formDTO.getConditions(), |
|
|
|
resultColumns, |
|
|
|
finalSubTables, |
|
|
|
agencyId, |
|
|
|
staffOrgPath,null, |
|
|
|
agencyIds, |
|
|
|
staffOrgPaths, |
|
|
|
queryGridIdList, |
|
|
|
null, |
|
|
|
formDTO.getKeyword(), |
|
|
|
groupByTables); |
|
|
|
pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size()); |
|
|
|
@ -1164,7 +1196,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
String staffOrgPath) { |
|
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); |
|
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); |
|
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, |
|
|
|
currentStaffAgencyId, Arrays.asList(staffOrgPath), null,map.get("groupByTables")); |
|
|
|
} |
|
|
|
|
|
|
|
@NotNull |
|
|
|
@ -2205,11 +2238,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Map<String, Object>> dynamicQuery(String customerId, String formCode, String resultTableName, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<ResiUserQueryValueDTO> conditions, String currentStaffAgencyId, String staffOrgPath) { |
|
|
|
public List<Map<String, Object>> dynamicQuery(String customerId, |
|
|
|
String formCode, |
|
|
|
String resultTableName, |
|
|
|
List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, |
|
|
|
List<ResiUserQueryValueDTO> conditions, |
|
|
|
String currentStaffAgencyId, |
|
|
|
List<String> staffOrgPath, |
|
|
|
List<String> gridIds) { |
|
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
|
List<String> exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList()); |
|
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); |
|
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); |
|
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, |
|
|
|
currentStaffAgencyId, staffOrgPath, gridIds, map.get("groupByTables")); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -3317,37 +3358,52 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
List<IcFormResColumnDTO> resultColumns = resultColumnRes.getData(); |
|
|
|
// 查询结果列对应的表:
|
|
|
|
Set<String> resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet()); |
|
|
|
List<String> queryAgencyIdList = formDTO.getConditions().stream() |
|
|
|
.filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()) |
|
|
|
&& CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO))) |
|
|
|
.flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList()); |
|
|
|
|
|
|
|
// 组织和网格单独处理
|
|
|
|
Set<String> queryAgencyIdList = new HashSet<>(); |
|
|
|
Set<String> queryGridIdList = new HashSet<>(); |
|
|
|
|
|
|
|
// 将以下几列单独提出来，组合起来，放入列表
|
|
|
|
formDTO.getConditions().stream().forEach(c -> { |
|
|
|
if (IcResiUserConstant.IC_RESI_USER.equals(c.getTableName()) && CollectionUtils.isNotEmpty(c.getColumnValue()) |
|
|
|
&& StringUtils.isNotBlank(c.getColumnValue().get(NumConstant.ZERO))) { |
|
|
|
if ("AGENCY_IDS".equals(c.getColumnName())) { |
|
|
|
queryAgencyIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("GRID_IDS".equals(c.getColumnName())) { |
|
|
|
queryGridIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("AGENCY_ID".equals(c.getColumnName())) { |
|
|
|
queryAgencyIdList.addAll(c.getColumnValue()); |
|
|
|
} else if ("GRID_ID".equals(c.getColumnName())) { |
|
|
|
queryGridIdList.addAll(c.getColumnValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
// 移除需要特殊处理的conditions
|
|
|
|
formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && ORG_FIELDS.contains(o.getColumnName())); |
|
|
|
|
|
|
|
//添加数据权限
|
|
|
|
String staffOrgPath; |
|
|
|
String agencyId; |
|
|
|
//如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据
|
|
|
|
if (queryAgencyIdList.isEmpty()){ |
|
|
|
List<String> staffOrgPaths; |
|
|
|
List<String> agencyIds = null; |
|
|
|
//如果查询条件中 没有有居民表的agencyId,则查询该工作人员所属组织的信息
|
|
|
|
if (queryAgencyIdList.isEmpty() && queryGridIdList.isEmpty()){ |
|
|
|
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); |
|
|
|
agencyId = staffInfoCacheResult.getAgencyId(); |
|
|
|
if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { |
|
|
|
staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); |
|
|
|
} else { |
|
|
|
staffOrgPath = staffInfoCacheResult.getAgencyId(); |
|
|
|
} |
|
|
|
agencyIds = Arrays.asList(staffInfoCacheResult.getAgencyId()); |
|
|
|
|
|
|
|
String op = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); |
|
|
|
staffOrgPaths = Arrays.asList(op); |
|
|
|
} else { |
|
|
|
formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())); |
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO)); |
|
|
|
if (agencyInfo == null){ |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败"); |
|
|
|
} |
|
|
|
agencyId = agencyInfo.getId(); |
|
|
|
staffOrgPath = agencyInfo.getPids(); |
|
|
|
if (StringUtils.isBlank(staffOrgPath)){ |
|
|
|
staffOrgPath = agencyId; |
|
|
|
}else{ |
|
|
|
staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId(); |
|
|
|
} |
|
|
|
// 将组织id列表，转化为组织orgIdPath列表
|
|
|
|
staffOrgPaths = queryAgencyIdList.stream().map(agId -> { |
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agId); |
|
|
|
if (agencyInfo == null) { |
|
|
|
String errorMsg = "查询机关单位失败:" + agId; |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|
|
|
} |
|
|
|
return PidUtils.convertPid2OrgIdPath(agId, agencyInfo.getPids()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
|
|
|
|
// 查询列表展示项需要用到哪些子表
|
|
|
|
Result<List<SubTableJoinDTO>> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1); |
|
|
|
List<SubTableJoinDTO> subTables = subTablesRes.getData(); |
|
|
|
@ -3375,14 +3431,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(); |
|
|
|
if (null == formDTO.getIsPage() || formDTO.getIsPage()) { |
|
|
|
//分页
|
|
|
|
String finalStaffOrgPath = staffOrgPath; |
|
|
|
List<String> finalStaffOrgPath = staffOrgPaths; |
|
|
|
List<String> finalAgencyIds = agencyIds; |
|
|
|
pageInfo = PageHelper.startPage(formDTO.getPageNo(), |
|
|
|
formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(), |
|
|
|
formDTO.getFormCode(), |
|
|
|
formDTO.getConditions(), |
|
|
|
resultColumns, |
|
|
|
finalSubTables, |
|
|
|
agencyId, finalStaffOrgPath,null, formDTO.getKeyword(), |
|
|
|
finalAgencyIds, |
|
|
|
finalStaffOrgPath, |
|
|
|
queryGridIdList, |
|
|
|
null, |
|
|
|
formDTO.getKeyword(), |
|
|
|
groupByTables)); |
|
|
|
} else { |
|
|
|
List<Map<String, Object>> list = baseDao.selectListResiMap(formDTO.getCustomerId(), |
|
|
|
@ -3390,8 +3451,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
formDTO.getConditions(), |
|
|
|
resultColumns, |
|
|
|
finalSubTables, |
|
|
|
agencyId, |
|
|
|
staffOrgPath,null, |
|
|
|
agencyIds, |
|
|
|
staffOrgPaths, |
|
|
|
queryGridIdList, |
|
|
|
null, |
|
|
|
formDTO.getKeyword(), |
|
|
|
groupByTables); |
|
|
|
pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size()); |
|
|
|
|
wxz
2 years ago