From 4c93d581de8323667e08bcb00dac88762a49e183 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 10:04:28 +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 | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 a1055c6..4d0892b 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
@@ -20,6 +20,7 @@
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
@@ -173,6 +174,12 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
+ iPage.getRecords().forEach(vo->{
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ //设置用户年龄
+ vo.setBirthday(birthday);
+ });
return R.ok(iPage);
}
@@ -503,4 +510,14 @@
}
return R.ok();
}
+
+ @Override
+ public R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO) {
+ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserById(userElectronicFileVO.getUserId());
+ if(electronicFileVO==null){
+ return R.fail("id有误！");
+ }
+ populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1