12/23 大屏修改

101captain

2021-12-23 5a8a90c095280fbd2106869ecd2bad10e01a57a6

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

@@ -119,7 +119,7 @@
        }
        Page userPage = new Page(pageComMngVillageDTO.getPageNum(), pageComMngVillageDTO.getPageSize());
        IPage<ComMngVillageDO> doPager =
            comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt));
            comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getName));

        IPage<ComMngVillageVO> villageVOIPage = new Page<>();
        villageVOIPage.setCurrent(doPager.getCurrent());
@@ -140,8 +140,20 @@
                    villageVO.setHouseTotal(villageTotal.getHouseTotal());
                    villageVO.setPopulationTotal(villageTotal.getPopulationTotal());
                }
                villageVOList.add(villageVO);

                //如果小区没有名字，则将街路巷和地区号拼接起来
                if(village.getName() != null && StringUtils.isNotEmpty(village.getName())){
                    villageVO.setGroupAt(village.getName());
                }else{
                    StringBuilder sb = new StringBuilder();
                    sb.append(village.getAlley());
                    if(!village.getHouseNum().contains("号")){
                        sb.append(village.getHouseNum() + "号");
                    }
                    villageVO.setGroupAt(sb.toString());
                    villageVO.setName(sb.toString());
                }
                villageVOList.add(villageVO);
            });
            villageVOIPage.setRecords(villageVOList);
        }
@@ -221,6 +233,7 @@
            return R.fail("id有误！");
        }
        BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
        comMngVillageDO.setName(comMngVillageVO.getGroupAt());
        ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
        if (comActDO == null || comActDO.getStreetId() == null) {
            return R.fail("社区没有绑定街道，请绑定后操作！");