代码合并

tangxiaobao

2021-07-31 377bc6f7ca8ee0e37007eeaf36bace8f54a1485a

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

@@ -214,15 +214,15 @@
    @Override
    public R exportDangerReport(List<Long> dangerReportIds) {
        List<ComSwDangerReportExcelVO> list = comSwDangerReportDAO.exportDangerReport(dangerReportIds);
        list.forEach(comSwDangerReportExcelVO -> {
            List<String> patrolUserIds = Arrays.asList(comSwDangerReportExcelVO.getPatrolPerson().split(","));
            List<String> patrolPhones = new ArrayList<>();
            for (String userId : patrolUserIds) {
                LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
                patrolPhones.add(loginUserInfoVO.getPhone());
            }
            comSwDangerReportExcelVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
        });
//        list.forEach(comSwDangerReportExcelVO -> {
//            List<String> patrolUserIds = Arrays.asList(comSwDangerReportExcelVO.getPatrolPerson().split(","));
//            List<String> patrolPhones = new ArrayList<>();
//            for (String userId : patrolUserIds) {
//                LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
//                patrolPhones.add(loginUserInfoVO.getPhone());
//            }
//            comSwDangerReportExcelVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
//        });
        return R.ok(list);
    }
}