Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -9,6 +9,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
@@ -208,4 +209,18 @@ public class SysDeptController {
     public Result<DeptOption> getDeptTree(){
         return sysDeptService.getDeptTree();
     }
+
+    /**
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @Author yinzuomei
+     * @Description 查询未建立党员群的网格列表
+     * @Date 2019/12/19 11:19
+     **/
+    @GetMapping("queryCompleteDept")
+
+    public Result<PageData<CompleteDeptDTO>> queryCompleteDept(@RequestParam Map<String, Object> params) {
+        PageData<CompleteDeptDTO> page = sysDeptService.listCompleteDeptDTO(params);
+        return new Result<PageData<CompleteDeptDTO>>().ok(page);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -145,4 +145,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Description: 查询所有
      */
     List<DeptTreeDTO> selectListDeptTree();
+
+    /**
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @Author yinzuomei
+     * @Description 查询未建立党员群的网格列表
+     * @Date 2019/12/19 12:54
+     **/
+	List<CompleteDeptDTO> selectListCompleteDeptDTO(Map<String, Object> params);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java

@@ -6,8 +6,11 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.util.List;
+
 /**
  *
  * 友邻社群模块调用
@@ -29,4 +32,14 @@ public interface GroupFeignClient {
      */
     @PostMapping(value = "group/epdc-app/group/createParty", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result createPartyGroup(CompleteDeptDTO formDto);
+
+    /**
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @Author yinzuomei
+     * @Description 查询已经建立党员群的网格id
+     * @Date 2019/12/19 13:01
+     **/
+    @GetMapping(value = "group/epdc-app/group/listPartyMemberGridId")
+    Result<List<String>> listPartyMemberGridId();
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java

@@ -7,6 +7,8 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.feign.GroupFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Author：liuchuang
  * @Date：2019/11/20 23:41
@@ -18,4 +20,9 @@ public class GroupFeignClientFallback implements GroupFeignClient {
     public Result createPartyGroup(CompleteDeptDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "createPartyGroup", formDto);
     }
+
+    @Override
+    public Result<List<String>> listPartyMemberGridId() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listPartyMemberGridId");
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.service;
 
+import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -189,4 +190,13 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/12/13 14:48
      */
     Result<DeptOption> getDeptTree();
+
+    /**
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @Author yinzuomei
+     * @Description 查询未建立党员群的网格列表
+     * @Date 2019/12/19 11:20
+     **/
+    PageData<CompleteDeptDTO> listCompleteDeptDTO(Map<String, Object> params);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -12,6 +12,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -20,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
@@ -596,4 +598,21 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         }
         return new Result<DeptOption>().ok((DeptOption) obj);
     }
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+	 * @Author yinzuomei
+	 * @Description 查询未建立党员群的网格列表
+	 * @Date 2019/12/19 11:20
+	 **/
+	@Override
+	public PageData<CompleteDeptDTO> listCompleteDeptDTO(Map<String, Object> params) {
+		//查询出已经建立党员群的网格id
+		Result<List<String>> gridListResult=groupFeignClient.listPartyMemberGridId();
+		params.put("gridList",gridListResult.getData());
+        IPage<CompleteDeptDTO> iPage = this.getPage(params);
+        List<CompleteDeptDTO> userDtoList = this.baseDao.selectListCompleteDeptDTO(params);
+        return new PageData<>(userDtoList, iPage.getTotal());
+	}
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -200,4 +200,34 @@
         FROM
             sys_dept sd
     </select>
+
+    <!--  查询未建立党员群的网格列表   -->
+    <select id="selectListCompleteDeptDTO" parameterType="map" resultType="com.elink.esua.epdc.dto.CompleteDeptDTO">
+        SELECT
+        dis.`name` district,
+        dis.id districtId,
+        str.`name` street,
+        str.id streetId,
+        com.`name` community,
+        com.id communityId,
+        gri.`name` grid,
+        gri.id gridId
+        FROM
+        sys_dept gri
+        LEFT JOIN sys_dept com ON gri.pid = com.id
+        LEFT JOIN sys_dept str ON com.pid = str.id
+        LEFT JOIN sys_dept dis ON str.pid = dis.id
+        WHERE gri.del_flag = '0'
+        and gri.type_key='grid_party'
+        <if test="grid != null and grid.trim() != ''">
+            and gri.`name` like concat('%', #{grid}, '%')
+        </if>
+        <if test="gridList!=null and  gridList.size()>0">
+            and gri.ID in
+            <foreach collection="gridList" index="index" item="gridId" open="(" separator="," close=")">
+                #{gridId}
+            </foreach>
+        </if>
+        order by gri.create_date desc
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java

@@ -260,4 +260,15 @@ public class AppGroupController {
         return groupService.joinGridPartyGroup(formDto);
     }
 
+    /**
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @Author yinzuomei
+     * @Description 查询已经建立党员群的网格id
+     * @Date 2019/12/19 13:03
+     **/
+    @GetMapping("listPartyMemberGridId")
+    public Result<List<String>> listPartyMemberGridId(){
+        return groupService.listPartyMemberGridId();
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java

@@ -148,5 +148,13 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @since 2019/11/20 22:54
      */
     GroupDTO selectOnePartyGroupInfoByGridId(Long gridId);
-	
-}
+
+    /**
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @Author yinzuomei
+     * @Description 查询已经建立党员群的网格id
+     * @Date 2019/12/19 13:08
+     **/
+	List<String> listPartyMemberGridId();
+}

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java

@@ -284,4 +284,12 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     Result savePartyGroups(List<CompleteDeptDTO> deptList);
 
-}
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @Author yinzuomei
+     * @Description 查询已经建立党员群的网格id
+     * @Date 2019/12/19 13:04
+     **/
+	Result<List<String>> listPartyMemberGridId();
+}

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -381,8 +381,8 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
     @Override
     public Result savePartyGroups(List<CompleteDeptDTO> deptList) {
-        for (CompleteDeptDTO dept:
-                deptList) {
+        for (CompleteDeptDTO dept :
+            deptList) {
             GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(dept, GroupCreateFormDTO.class);
             groupCreateFormDto.setGroupName(dept.getCommunity().concat(dept.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX));
             groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR);
@@ -398,4 +398,15 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
         return new Result();
     }
-}
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
+     * @Author yinzuomei
+     * @Description 查询已经建立党员群的网格id
+     * @Date 2019/12/19 13:04
+     **/
+    @Override
+    public Result<List<String>> listPartyMemberGridId() {
+        return new Result<List<String>>().ok(baseDao.listPartyMemberGridId());
+    }
+}

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -135,7 +135,7 @@
         ORDER BY
             MAX( tp.CREATED_TIME ) DESC
     </select>
-    
+
     <select id="selectOneOfGroupDetailForMobileEnd" resultType="com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO">
         SELECT
             gp.ID,
@@ -268,4 +268,11 @@
         SELECT * FROM epdc_group WHERE DEL_FLAG = '0' AND GROUP_CATEGORY = '0' AND GRID_ID = #{gridId}
     </select>
 
-</mapper>
+    <!--   查询已经建立党员群的网格id -->
+    <select id="listPartyMemberGridId" resultType="java.lang.String">
+        select eg.GRID_ID
+        from epdc_group eg
+        where eg.DEL_FLAG='0'
+        and eg.GROUP_CATEGORY='0'
+    </select>
+</mapper>