Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-20 e8b8e5143221ed74398ee181b25e2687535ac347

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -213,7 +213,7 @@
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
            return R.fail();
            return R.fail(e.getMessage());
        }
        return R.ok();
    }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java

@@ -191,7 +191,7 @@
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
            return R.fail();
            return R.fail(e.getMessage());
        }
        return R.ok();
    }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java

@@ -87,7 +87,7 @@
     */
    @PostMapping("page")
    @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class)
    R query(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){
    R query(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        return communityService.query(pageEldersAuthDTO);
    }

 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;
    }



 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java

@@ -174,6 +174,7 @@
            comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>());
        }
        Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
        List<String> errorInfo = new ArrayList<>();
        list.forEach(comCvtServeExcelVO -> {
            /**
             * 便民服务分类存在 并且 便民服务商家 匹配上
@@ -189,9 +190,21 @@
                }else{
                    log.error(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
                }
            }else{
                if(!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
                    errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
                }
                if(!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
                    errorInfo.add(comCvtServeExcelVO.getBusinessName() +"导入失败: 便民服务商家不存在");
                }
            }
        });
        this.saveBatch(comCvtServeDOS);
        boolean saveBatched = this.saveBatch(comCvtServeDOS);
        if(saveBatched) {
            if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
                return R.fail("导入部分成功：" + errorInfo.toString());
            }
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }