From e8b8e5143221ed74398ee181b25e2687535ac347 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 15:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index eab1bfe..4dea248 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1541,8 +1541,11 @@
@PostMapping("/eldersauth/getMyfamilyElders/{userId}")
R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);
+
+ List<ComMngFamilyInfoVO> sortedList = list.stream().sorted(Comparator.comparing(ComMngFamilyInfoVO::getCreateAt).reversed()).collect(Collectors.toList());
+
List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
- list.forEach(rt -> {
+ sortedList.forEach(rt -> {
boolean isElders = rt.getAge()>=80;
if(isElders){
listRt.add(rt);
@@ -1611,7 +1614,7 @@
SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
sysUserNoticeVO.setType(3);
- sysUserNoticeVO.setTitle("高龄认证社区社区反馈");
+ sysUserNoticeVO.setTitle("高龄认证社区反馈");
sysUserNoticeVO.setBusinessType(13);
sysUserNoticeVO.setBusinessTitle(" ");
sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈");
@@ -1624,7 +1627,7 @@
}
}
- return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
+ return addR;
}
--
Gitblit v1.7.1