From 7c110f5cf5f0049e77c3cb982b0d9bafa5acd493 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 10 六月 2021 14:17:07 +0800 Subject: [PATCH] Merge branch 'test_elder_cedoo' into 'test' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 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 9b8501a..62a9965 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 @@ -17,9 +17,7 @@ import com.panzhihua.common.model.vos.area.AreaAddressVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.*; -import com.panzhihua.common.utlis.AgeUtils; -import com.panzhihua.common.utlis.IdCard; -import com.panzhihua.common.utlis.PayUtil; +import com.panzhihua.common.utlis.*; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComMngPopulationHouseUserService; @@ -31,7 +29,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import com.panzhihua.common.utlis.StringUtils; import javax.annotation.Resource; import javax.crypto.BadPaddingException; @@ -234,6 +231,20 @@ } } + if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())){ + String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)),"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"); + if(StringUtils.isNotEmpty(ageEndTime)){ + comMngPopulationVO.setAgeEndTime(ageEndTime); + } + } + IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO); if(!iPage.getRecords().isEmpty()){ iPage.getRecords().forEach(populDO -> { @@ -410,6 +421,7 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setHouseAddress(address); populationDO.setHouseId(populationHouseDO.getId()); + populationDO.setUpdateAt(new Date()); this.baseMapper.insert(populationDO); savePopulList.add(populationDO); index++; @@ -426,6 +438,7 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setHouseAddress(address); populationDO.setHouseId(populationHouseDO.getId()); + populationDO.setUpdateAt(new Date()); this.baseMapper.insert(populationDO); savePopulList.add(populationDO); index++; -- Gitblit v1.7.1