From b827b2710c1f9ac64fe8879f08e1008a8647966a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 07 七月 2022 13:42:12 +0800
Subject: [PATCH] 大屏数据调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 1e85929..7057dfd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/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());
@@ -145,13 +145,7 @@
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());
+ villageVO.setName(villageVO.getGroupAt());
}
villageVOList.add(villageVO);
});
@@ -233,6 +227,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("社区没有绑定街道，请绑定后操作！");
@@ -283,6 +278,12 @@
new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
}
+ @Override
+ public R getGridVillageListApp(ComMngVillageListAppDTO villageListAppDTO) {
+ return R.ok(this.baseMapper.getGridVillageList(
+ new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
+ }
+
/**
* 综治app-根据小区id查询小区下楼栋列表
*
--
Gitblit v1.7.1