From 973caebefdd691d45108d56fc96b9aa2e5fc6fe8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 七月 2021 16:59:30 +0800
Subject: [PATCH] 修改bug以及综治后台网格员工作汇总导出接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index 2370ba7..dd73f50 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -8,6 +8,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
@@ -134,7 +136,51 @@
if(memberCascadeAddDTO.getType() == null){
return R.fail("参数错误");
}
- return R.ok(this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId()));
+ List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());
+
+ List<GridMemberCascadeVO> result = new ArrayList<>();
+ if(!memberCascadeList.isEmpty()){
+ memberCascadeList.forEach(cascade -> {
+ if(memberCascadeAddDTO.getType().equals(1)){//过滤无小区的社区
+ Integer count = this.baseMapper.getVillageCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else if(memberCascadeAddDTO.getType().equals(2)){//过滤无楼栋的小区
+ Integer count = this.baseMapper.getBuildingCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else{
+ if(!cascade.getName().contains("栋")){
+ cascade.setName(cascade.getName() + "栋");
+ }
+ result.add(cascade);
+ }
+ });
+ }
+ return R.ok(result);
+ }
+
+ @Override
+ public R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO){
+ return R.ok(eventGridMemberRelationMapper.getMapGridListsByApp(cascadeListDTO));
+ }
+
+ @Override
+ public R getMapGridsListsByApp(Long userId){
+ List<EventMapGridCascadeVO> resultList = new ArrayList<>();
+ List<EventMapGridCascadeVO> list = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,1,null);
+ if(!list.isEmpty()){
+ list.forEach(gridCascadeVO -> {
+ List<EventMapGridCascadeVO> childList = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,2,gridCascadeVO.getGridId());
+ if(!childList.isEmpty()){
+ gridCascadeVO.setChildList(childList);
+ resultList.add(gridCascadeVO);
+ }
+ });
+ }
+ return R.ok(resultList);
}
}
--
Gitblit v1.7.1