From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 f76ea13..c6376b6 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
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
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.admin.GridMemberCascadeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
@@ -19,7 +18,9 @@
import org.springframework.beans.BeanUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -119,4 +120,44 @@
return R.ok(this.baseMapper.getMapGridListByApp(userId));
}
+ /**
+ * 查询市平台网格员列表
+ * @return 市平台网格员列表
+ */
+ @Override
+ public R lcList(){
+ return R.ok(this.baseMapper.getGridMemberLcList());
+ }
+
+ @Override
+ public R gridMemberCascadeList(EventGridMemberCascadeAddDTO memberCascadeAddDTO){
+ if(memberCascadeAddDTO.getType() == null){
+ return R.fail("参数错误");
+ }
+ 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);
+ }
+
}
--
Gitblit v1.7.1