From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 931ec7f..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
@@ -232,14 +232,14 @@
}
if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())){
- String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()))),"yyyy-MM-dd");
+ 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()))),"yyyy-MM-dd");
+ String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)),"yyyy-MM-dd");
if(StringUtils.isNotEmpty(ageEndTime)){
comMngPopulationVO.setAgeEndTime(ageEndTime);
}
@@ -421,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++;
@@ -437,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