修改bug

huanghongfa

2021-05-20 5505b625d6de9811f69b8c6960d6d82f5a7db5aa

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,6 +33,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -1539,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);
@@ -1608,8 +1613,8 @@
        if(R.isOk(addR)){
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
            sysUserNoticeVO.setType(1);
            sysUserNoticeVO.setTitle("高龄认证社区社区反馈");
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("高龄认证社区反馈");
            sysUserNoticeVO.setBusinessType(13);
            sysUserNoticeVO.setBusinessTitle(" ");
            sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈");
@@ -1622,7 +1627,7 @@
            }
        }

        return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
        return addR;
    }