From 098b507166a2b23f0256d5c4f097e7f05f11e9be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 09:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 213 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index a7eb044..a5aa7e2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -5,14 +5,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
@@ -41,6 +44,7 @@
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
@@ -51,6 +55,7 @@
import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.ComMngVillageService;
import com.panzhihua.service_community.service.EventResourceService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -60,12 +65,14 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 实有人口Service实现类
*/
+@Slf4j
@Service
public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
@Resource
@@ -90,8 +97,11 @@
private EventResourceService eventResourceService;
@Resource
private BigScreenDAO bigScreenDAO;
+ @Resource
+ private ComMngUserTagDAO comMngUserTagDAO;
@Value("${domain.aesKey:}")
private String aesKey;
+
/**
@@ -174,6 +184,23 @@
// if (!comMngFamilyInfoVOS.isEmpty()) {
// comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
// }
+ //查询户主关系信息
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByPopuId(comMngPopulationDO.getId());
+ if (!comMngFamilyInfoVOS.isEmpty()) {
+ for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS){
+ comHouseMemberVo.setAge(AgeUtils.getAgeFromBirthTimes(comHouseMemberVo.getBirthDay()));
+ }
+ comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+ //设置户主关系
+ List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
+ if (!comMngPopulationHouseUserDOS.isEmpty()) {
+ comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
+ }
+ //设置年龄
+ if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
+ comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
+ }
//查询当前用户电子档信息
if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
@@ -261,19 +288,33 @@
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
- String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)), "yyyy-MM-dd");
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageStartTime)) {
comMngPopulationVO.setAgeStartTime(ageStartTime);
}
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
- String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)), "yyyy-MM-dd");
+ String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageEndTime)) {
comMngPopulationVO.setAgeEndTime(ageEndTime);
}
}
-
+ if (comMngPopulationVO.getAgeStartTime() !=null && !"".equals(comMngPopulationVO.getAgeStartTime()) && comMngPopulationVO.getAgeEndTime() !=null && !"".equals(comMngPopulationVO.getAgeEndTime())){
+ if (comMngPopulationVO.getAgeStartTime().equals(comMngPopulationVO.getAgeEndTime())) {
+ Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeStartTimeEnd(ageStartTime);
+ }
+ } else {
+ Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeEndTimeEnd(ageStartTime);
+ }
+ }
+ }
IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
if (!iPage.getRecords().isEmpty()) {
iPage.getRecords().forEach(populDO -> {
@@ -355,7 +396,7 @@
ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
if (comMngVillageDO == null) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorMsg("街路巷或小区号不存在");
+ importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
populationImportErrorVOList.add(importErrorVO);
// index++;
@@ -392,11 +433,13 @@
if (populationDO == null) {
//不存在实有人口,则新增
populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
+// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
} else {
//如果存在人口信息，且是自用房，则更新人口默认的房屋信息
- if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
- populationDO = updatePopulationDO(vo, populationDO);
- }
+// if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
+// populationDO = updatePopulationDO(vo, populationDO);
+// }
+ populationDO = updatePopulationDO(vo, comActDO, populationDO);
}
//处理实有人口房屋居住信息
@@ -411,6 +454,7 @@
populationHouseUserDO.setPopulId(populationDO.getId());
populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
+ populationHouseUserDO.setResidence(vo.getResidence());
comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
}
}
@@ -428,19 +472,37 @@
return R.ok();
}
- private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO) throws Exception {
+ private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngPopulationDO populationDO) throws Exception {
UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id",populationDO.getId());
ComMngPopulationDO update = new ComMngPopulationDO();
- update.setRoad(vo.getRoad());
- update.setDoorNo(vo.getDoorNo());
- update.setFloor(vo.getFloor());
- update.setUnitNo(vo.getUnitNo());
- update.setHouseNo(vo.getHouseNo());
- update.setHouseId(vo.getHouseId());
- if (StringUtils.isNotEmpty(populationDO.getPhone())) {
- update.setPhone(populationDO.getPhone());
+// update.setRoad(vo.getRoad());
+// update.setDoorNo(vo.getDoorNo());
+// update.setFloor(vo.getFloor());
+// update.setUnitNo(vo.getUnitNo());
+// update.setHouseNo(vo.getHouseNo());
+// update.setHouseId(vo.getHouseId());
+// if (StringUtils.isNotEmpty(populationDO.getPhone())) {
+// update.setPhone(populationDO.getPhone());
+// }
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ BeanUtils.copyProperties(vo, update);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ //查询当前社区标签列表
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId()));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!list.contains(s))
+ iterator.remove();
+ }
+ update.setLabel(Joiner.on(",").join(userTag));
+ update.setCardNo(cardNoAES);
this.baseMapper.update(update,updateWrapper);
return populationDO;
}
@@ -450,6 +512,19 @@
BeanUtils.copyProperties(vo, populationDO);
populationDO.setId(Snowflake.getId());
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ //查询当前社区标签列表
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId()));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!list.contains(s))
+ iterator.remove();
+ }
populationDO.setVillageId(comMngVillageDO.getVillageId());
populationDO.setActId(comActDO.getCommunityId());
populationDO.setStreetId(comActDO.getStreetId());
@@ -508,6 +583,19 @@
}
comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
+ }
+
+ private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setPopulId(comMngPopulationDO.getId());
+ populationHouseUserDO.setHouseId(comMngPopulationHouseDO.getId());
+ populationHouseUserDO.setRelationId(comMngPopulationHouseDO.getStatus());
+ populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setCreateAt(new Date());
+ comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
+ return populationHouseUserDO;
}
/**
@@ -664,6 +752,20 @@
}
@Override
+ public R getPopulationListByVillageId(Long villageId) {
+ List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
+ List<ComMngPopulationVO> resultList = new ArrayList<>();
+ if (list.size() > 0) {
+ list.forEach(populationDO -> {
+ ComMngPopulationVO populationVO = new ComMngPopulationVO();
+ BeanUtils.copyProperties(populationDO, populationVO);
+ resultList.add(populationVO);
+ });
+ }
+ return R.ok(resultList);
+ }
+
+ @Override
public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception {
ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
if (populationDO == null) {
@@ -707,10 +809,15 @@
if (!vo.getHouseEditDTOList().isEmpty()) {
for (ComMngPopulationHouseEditDTO houseEditDto : vo.getHouseEditDTOList()) {
ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
populationHouseUserDO.setHouseId(houseEditDto.getId());
+ populationHouseUserDO.setRelation(houseEditDto.getRelation());
if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
houseId = houseEditDto.getId();//居住地
+ populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.yes);
+ }else {
+ populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.no);
}
populationHouseUserDOList.add(populationHouseUserDO);
@@ -739,7 +846,20 @@
}
}
}
- populationDO.setUpdateAt(new Date());
+
+// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+// .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
+// if (comMngPopulationHouseUserDO != null) {
+// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+// comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
+// }else {
+// comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
+// comMngPopulationHouseUserDO.setId(Snowflake.getId());
+// comMngPopulationHouseUserDO.setPopulId(vo.getId());
+// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+// comMngPopulationHouseUserDO.setCreateAt(new Date());
+// comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
+// }
if (populationDAO.updateById(populationDO) > 0) {
return R.ok();
} else {
@@ -773,6 +893,62 @@
} else {
return R.fail();
}
+ }
+
+ @Override
+ public R specialInputUserTags(PageInputUserDTO comMngUserTagDTO) {
+ IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(new Page<>(comMngUserTagDTO.getPageNum()
+ , comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
+ return R.ok(iPage);
+ }
+
+ @Override
+ public R saveSpecialInputUserTags(ComMngTagVO comMngTagVO) {
+ if (null != comMngTagVO.getId() && comMngTagVO.getId() != 0) {
+ //修改
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(comMngTagVO.getId());
+ if (null == comMngUserTagDO) {
+ return R.fail("该标签不存在");
+ }
+ ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
+ return R.fail("该标签已存在，标签名称重复");
+ }
+
+ BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
+ int update = comMngUserTagDAO.updateById(comMngUserTagDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ } else {
+ //新增
+ Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ if (count > 0) {
+ return R.fail("该标签已存在，标签名称重复");
+ }
+ ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
+ BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
+ int insert = comMngUserTagDAO.insert(comMngUserTagDO);
+ if (insert > 0) {
+ return R.ok();
+ }
+ }
+
+ return R.fail("添加失败");
+ }
+
+ @Override
+ public R deleteSpecialInputUserTags(Long id) {
+ //查询特殊群体人员
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(id);
+ if (comMngUserTagDO == null) {
+ return R.fail("该标签不存在");
+ }
+ int delete = comMngUserTagDAO.deleteById(id);
+ if (delete > 0) {
+ return R.ok();
+ }
+ return R.fail("删除失败");
}
/**
@@ -1018,24 +1194,26 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
@Override
- public R getScreenEvent(Long communityId) {
+ public R getScreenEvent(BigScreenEventDTO screenEventDTO) {
+
+ Long communityId = screenEventDTO.getCommunityId();
//创建统计返回参数
EventStatisticsVO statisticsVO = new EventStatisticsVO();
//查询页面左边数据
EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
//查询左上数据
- EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
+ EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
//查询时间频发月份
List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
leftTopStatisticsVO.setOftenMonth(monthList);
leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
//查询左下数据
- EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
+ EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
@@ -1085,7 +1263,7 @@
statisticsVO.setGridStatisticsList(gridStatisticsList);
//查询社区事件列表
- List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
+ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
statisticsVO.setGridIncidentList(gridIncidentList);
//查询小区列表
@@ -1094,7 +1272,11 @@
villageStatisticsList.forEach(village -> {
CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
if(villageStatisticsVO != null){
- BeanUtils.copyProperties(villageStatisticsVO,village);
+ village.setPeopleNum(villageStatisticsVO.getPeopleNum());
+ village.setHouseNum(villageStatisticsVO.getHouseNum());
+ village.setRegisterNum(villageStatisticsVO.getRegisterNum());
+ village.setFlowNum(villageStatisticsVO.getFlowNum());
+// BeanUtils.copyProperties(villageStatisticsVO,village);
}
});
}
@@ -1555,6 +1737,14 @@
*/
@Override
public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
+ if(StringUtils.isNotEmpty(populationListDTO.getKeyWord())){
+ try {
+ populationListDTO.setCardNo(AESUtil.encrypt128(populationListDTO.getKeyWord(),aesKey));
+ }catch (Exception e){
+ log.error("转换身份证号码失败");
+ }
+ }
+
IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
if(!populationListIPage.getRecords().isEmpty()){
populationListIPage.getRecords().forEach(population -> {
--
Gitblit v1.7.1