党群管理

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserBannedFormDTO.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2020-06-01
+ */
+@Data
+public class GroupUserBannedFormDTO implements Serializable {
+    private static final long serialVersionUID = -8847567240714882803L;
+
+    /**
+     * 用户党群关联表iD
+     */
+    @NotBlank(message = "用户党群关联表ID不能为空")
+    private String id;
+
+    /**
+     * 禁言标识
+     */
+    @NotBlank(message = "禁言标识不能为空")
+    private String bannedFlag;
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserManagerFormDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2020-06-01
+ */
+@Data
+public class GroupUserManagerFormDTO implements Serializable {
+    private static final long serialVersionUID = -8847567240714882803L;
+
+    /**
+     * 用户党群关联表iD
+     */
+    @NotBlank(message = "用户党群关联表ID不能为空")
+    private String groupUserId;
+
+    /**
+     * 身份标识
+     */
+    @NotBlank(message = "身份标识不能为空")
+    private String identityFlag;
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java

@@ -117,5 +117,13 @@ public class PartyGroupDTO implements Serializable {
      * 更新时间
      */
 	private Date updatedTime;
+    /**
+     * 群主ID
+     */
+    private String userId;
+    /**
+     * 群主昵称
+     */
+    private String nickname;
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyUserGroupDTO.java

@@ -123,4 +123,39 @@ public class PartyUserGroupDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 禁言状态
+     */
+    private String bannedState;
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+
+ */
+package com.elink.esua.epdc.dto.constant;
+
+/**
+ * 常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface PartyGroupConstant {
+    /**
+     * 党群身份标识  群主
+     */
+    String PARTY_GROUP_IDENTITY_FLAG = "1";
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java

@@ -28,8 +28,10 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
 import com.elink.esua.epdc.dto.PartyGroupListDTO;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.excel.PartyGroupExcel;
 import com.elink.esua.epdc.service.PartyGroupService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -53,7 +55,7 @@ public class PartyGroupController {
 
     @GetMapping("page")
     public Result<PageData<PartyGroupDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyGroupDTO> page = partyGroupService.page(params);
+        PageData<PartyGroupDTO> page = partyGroupService.listPage(params);
         return new Result<PageData<PartyGroupDTO>>().ok(page);
     }
 
@@ -107,4 +109,13 @@ public class PartyGroupController {
     }
 
 
+    @GetMapping("getUserList/{deptId}")
+    public Result<List<UserDTO>> getUserList(@PathVariable("deptId") Long deptId) {
+        if(deptId==null){
+            return new Result<List<UserDTO>>().error("部门ID为空！");
+        }
+        List<UserDTO> data = partyGroupService.getUserList(deptId);
+        return new Result<List<UserDTO>>().ok(data);
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyUserGroupController.java

@@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.GroupUserBannedFormDTO;
+import com.elink.esua.epdc.dto.GroupUserManagerFormDTO;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.excel.PartyUserGroupExcel;
 import com.elink.esua.epdc.service.PartyUserGroupService;
@@ -51,7 +53,7 @@ public class PartyUserGroupController {
 
     @GetMapping("page")
     public Result<PageData<PartyUserGroupDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyUserGroupDTO> page = partyUserGroupService.page(params);
+        PageData<PartyUserGroupDTO> page = partyUserGroupService.listPage(params);
         return new Result<PageData<PartyUserGroupDTO>>().ok(page);
     }
 
@@ -90,5 +92,28 @@ public class PartyUserGroupController {
         List<PartyUserGroupDTO> list = partyUserGroupService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, PartyUserGroupExcel.class);
     }
+    /**
+     * @Description  禁言
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("banned")
+    public Result banned(@RequestBody GroupUserBannedFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return partyUserGroupService.modifyBannedState(formDto);
+    }
+    /**
+     * @Description  设为身份标识
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("setGroupManager")
+    public Result setGroupManager(@RequestBody GroupUserManagerFormDTO formDto) {
+        return partyUserGroupService.modifyGroupManagerState(formDto);
+    }
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java

@@ -18,11 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyGroupDTO;
 import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 党群表 
@@ -40,4 +42,19 @@ public interface PartyGroupDao extends BaseDao<PartyGroupEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupListDTO>
      **/
     List<PartyGroupListDTO> selectListOfGroupByDeptId(Long deptId);
+    /**
+     * @Description  pc列表
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [params]
+     **/
+    List<PartyGroupDTO> selectListOfPartyGroupDTO(Map<String, Object> params);
+    /**
+     * @Description  pc获取详情
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [id]
+     * @return com.elink.esua.epdc.entity.PartyGroupEntity
+     **/
+    PartyGroupDTO selectDetailById(String id);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党群成员关系表 
  *
@@ -29,5 +33,28 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyUserGroupDao extends BaseDao<PartyUserGroupEntity> {
-	
+    /**
+     * @Description   获取指定党群内的群主信息
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [ groupId]
+     * @return com.elink.esua.epdc.dto.PartyUserGroupDTO
+     **/
+    PartyUserGroupDTO getManagerByGroupId(String groupId);
+    /**
+     * @Description  获取指定党群内的用户信息
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [groupId, userId]
+     * @return com.elink.esua.epdc.dto.PartyUserGroupDTO
+     **/
+    PartyUserGroupDTO getUserByGroupIdAndUserId(String groupId, String userId);
+    /**
+     * @Description  pc列表
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyUserGroupDTO>
+     **/
+    List<PartyUserGroupDTO> getPartyUserGroupPageFromPC(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java

@@ -88,4 +88,7 @@ public class PartyGroupEntity extends BaseEpdcEntity {
      */
 	private String parentDeptNames;
 
+
+
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyUserGroupEntity.java

@@ -92,5 +92,34 @@ public class PartyUserGroupEntity extends BaseEpdcEntity {
      * 禁言结束时间
      */
 	private Date bannedEndTime;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/enums/BannedEnum.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.enums;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 禁言标识枚举
+ *
+ * @author songyunpeng
+ * @Date 20-04-2
+ */
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum BannedEnum {
+    /**
+     * 不禁言
+     */
+    BANNED_NO("0"),
+    /**
+     * 禁言一天
+     */
+    BANNED_DAY("1"),
+    /**
+     * 禁言一周
+     */
+    BANNED_WEEK("2"),
+    /**
+     * 禁言一月
+     */
+    BANNED_MONTH("3"),
+    /**
+     * 永久禁言
+     */
+    BANNED_FOREVER("4");
+
+    private String value;
+
+    BannedEnum(final String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -4,16 +4,11 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
-import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.List;
 
 
 /**

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+
+/**
+ * 用户接口
+ *
+ * @author songyunpeng
+ * @since 1.0.0
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient")
+public interface UserFeignClient {
+    
+    /**
+     * @Description  获取指定街道下用户信息（未删除，状态不为0）
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [deptId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.UserDTO>>
+     **/
+    @GetMapping("/app-user/user/getUserList/{deptId}")
+    Result<List<UserDTO>> getUserList(@PathVariable("deptId") Long deptId);
+
+    /**
+     * @Description  查询用户基础信息 
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     **/
+    @GetMapping("app-user/epdc-app/user/getById/{userId}")
+    Result<UserDTO> getUserInfoById(@PathVariable("userId") String userId);
+
+    /**
+     * @Description   获取用户第一次扫码网格的信息
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     **/
+    @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<UserGridRelationDTO> getUserFirstScanGird(@PathVariable("userId") String userId);
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.feign.UserFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 用户接口 Fallback
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class UserFeignClientFallback implements UserFeignClient {
+
+
+    @Override
+    public Result<List<UserDTO>> getUserList(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserList", deptId);
+    }
+
+
+    @Override
+    public Result<UserDTO> getUserInfoById(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
+    }
+
+    @Override
+    public Result<UserGridRelationDTO> getUserFirstScanGird(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId);
+    }
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
 import com.elink.esua.epdc.dto.PartyGroupListDTO;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 
 import java.util.List;
@@ -101,4 +102,20 @@ public interface PartyGroupService extends BaseService<PartyGroupEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupListDTO>
      **/
     List<PartyGroupListDTO> listOfGroupByDeptId(Long deptId);
+    /**
+     * @Description   获取指定街道下用户信息（未删除，状态不为0）
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [deptId]
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     **/
+    List<UserDTO> getUserList(Long deptId);
+    /**
+     * @Description  获取pc列表 
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyGroupDTO>
+     **/
+    PageData<PartyGroupDTO> listPage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java

@@ -19,6 +19,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.GroupUserBannedFormDTO;
+import com.elink.esua.epdc.dto.GroupUserManagerFormDTO;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 
@@ -92,4 +95,44 @@ public interface PartyUserGroupService extends BaseService<PartyUserGroupEntity>
      * @date 2020-05-29
      */
     void delete(String[] ids);
+    /**
+     * @Description  获取指定党群内的群主信息
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [ groupId]
+     * @return com.elink.esua.epdc.dto.PartyUserGroupDTO
+     **/
+    PartyUserGroupDTO getManagerByGroupId(String groupId);
+    /**
+     * @Description  获取指定党群内的用户信息
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [ groupId]
+     * @return com.elink.esua.epdc.dto.PartyUserGroupDTO
+     **/
+    PartyUserGroupDTO getUserByGroupIdAndUserId(String groupId,String userId);
+    /**
+     * @Description  pc列表 
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyUserGroupDTO>
+     **/
+    PageData<PartyUserGroupDTO> listPage(Map<String, Object> params);
+    /**
+     * @Description  禁言 
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result modifyBannedState(GroupUserBannedFormDTO formDto);
+    /**
+     * @Description 修改身份
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [id, i]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result modifyGroupManagerState(GroupUserManagerFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java

@@ -26,14 +26,14 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyGroupDao;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.PartyGroupDTO;
-import com.elink.esua.epdc.dto.PartyGroupListDTO;
-import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
+import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.redis.PartyGroupRedis;
 import com.elink.esua.epdc.service.PartyGroupService;
+import com.elink.esua.epdc.service.PartyUserGroupService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +58,13 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+
+    @Autowired
+    private UserFeignClient userFeignClient;
+
+    @Autowired
+    private PartyUserGroupService partyUserGroupService;
+
     @Override
     public PageData<PartyGroupDTO> page(Map<String, Object> params) {
         IPage<PartyGroupEntity> page = baseDao.selectPage(
@@ -85,13 +92,21 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
 
     @Override
     public PartyGroupDTO get(String id) {
-        PartyGroupEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PartyGroupDTO.class);
+        return  baseDao.selectDetailById(id);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyGroupDTO dto) {
+        //保存部门信息
+        this.saveDeptInfo(dto);
+        PartyGroupEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupEntity.class);
+        insert(entity);
+        //保存群主信息
+        this.insertUserGroup(dto.getUserId(),entity.getId());
+    }
+
+    private void saveDeptInfo(PartyGroupDTO dto) {
         //赋值部门名称
         Result<SysDeptDTO> sysDeptDTO = adminFeignClient.getSysDeptDTO(Long.parseLong(dto.getDeptId()));
         if(!sysDeptDTO.success() || sysDeptDTO.getData()==null){
@@ -110,15 +125,72 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
             dto.setParentDeptIds(deptDTO.getParentDeptIds());
             dto.setParentDeptNames(deptDTO.getParentDeptNames());
         }
-        PartyGroupEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupEntity.class);
-        insert(entity);
+    }
+
+    private void insertUserGroup(String userId,String partyGroupId) {
+        Result<UserDTO> userInfoById = userFeignClient.getUserInfoById(userId);
+        if(!userInfoById.success() || userInfoById.getData() == null){
+            throw new RenException("获取用户信息失败");
+        }
+        UserDTO userDto = userInfoById.getData();
+        PartyUserGroupEntity partyUserGroupEntity = new PartyUserGroupEntity();
+        partyUserGroupEntity.setIdentityFlag(userDto.getPartyFlag());
+        partyUserGroupEntity.setUserId(userDto.getId());
+        partyUserGroupEntity.setNickname(userDto.getNickname());
+        partyUserGroupEntity.setUserAvatar(userDto.getFaceImg());
+        partyUserGroupEntity.setMobile(userDto.getMobile());
+        partyUserGroupEntity.setPartyGroupId(partyGroupId);
+        partyUserGroupEntity.setIdentityFlag("1");
+        //网格信息
+        if(userDto.getGridId()!=null && userDto.getGridId()!=0){
+            partyUserGroupEntity.setGrid(userDto.getGrid());
+            partyUserGroupEntity.setGridId(userDto.getGridId());
+            partyUserGroupEntity.setAllDeptIds(userDto.getAllDeptIds());
+            partyUserGroupEntity.setAllDeptNames(userDto.getAllDeptNames());
+            partyUserGroupEntity.setParentDeptIds(userDto.getParentDeptIds());
+            partyUserGroupEntity.setParentDeptNames(userDto.getParentDeptNames());
+        }else{
+            Result<UserGridRelationDTO> userFirstScanGird = userFeignClient.getUserFirstScanGird(userId);
+            if(!userFirstScanGird.success() || userFirstScanGird.getData() == null){
+                throw new RenException("获取用户网格关联信息失败");
+            }
+            UserGridRelationDTO userGridRelationDTO = userFirstScanGird.getData();
+            partyUserGroupEntity.setGrid(userGridRelationDTO.getGrid());
+            partyUserGroupEntity.setGridId(userGridRelationDTO.getGridId());
+            partyUserGroupEntity.setAllDeptIds(userGridRelationDTO.getAllDeptIds());
+            partyUserGroupEntity.setAllDeptNames(userGridRelationDTO.getAllDeptNames());
+            partyUserGroupEntity.setParentDeptIds(userGridRelationDTO.getParentDeptIds());
+            partyUserGroupEntity.setParentDeptNames(userGridRelationDTO.getParentDeptNames());
+        }
+        partyUserGroupService.insert(partyUserGroupEntity);
+
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(PartyGroupDTO dto) {
+        //保存部门信息
+        this.saveDeptInfo(dto);
         PartyGroupEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupEntity.class);
         updateById(entity);
+        //判断是否更新群主
+        PartyUserGroupDTO managerByGroupId = partyUserGroupService.getManagerByGroupId(dto.getId());
+        //存在群主且如过改变群主信息 则之前群主为群成员
+        if(managerByGroupId != null && !managerByGroupId.getUserId().equals(dto.getUserId())){
+            //先更新之前的群主为群成员
+            managerByGroupId.setIdentityFlag("0");
+            partyUserGroupService.update(managerByGroupId);
+        }
+        //判断新指定的群主是否已存在党群成员中
+        PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(dto.getId(), dto.getUserId());
+        //新指定群主不存在则直接新增
+        if(userByGroupIdAndUserId==null){
+            //保存群主信息
+            this.insertUserGroup(dto.getUserId(),entity.getId());
+        }else{//存在则只更新身份标识
+            userByGroupIdAndUserId.setIdentityFlag("1");
+            partyUserGroupService.update(userByGroupIdAndUserId);
+        }
     }
 
     @Override
@@ -134,4 +206,20 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
 
     }
 
+    @Override
+    public List<UserDTO> getUserList(Long deptId) {
+        Result<List<UserDTO>> userList = userFeignClient.getUserList(deptId);
+        if(!userList.success() || userList.getData()==null){
+            throw new RenException("获取用户列表信息失败");
+        }
+        return userList.getData();
+    }
+
+    @Override
+    public PageData<PartyGroupDTO> listPage(Map<String, Object> params) {
+        IPage<PartyGroupDTO> page = getPage(params);
+        List<PartyGroupDTO> list = baseDao.selectListOfPartyGroupDTO(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java

@@ -20,12 +20,19 @@ package com.elink.esua.epdc.service.impl;
 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.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyUserGroupDao;
+import com.elink.esua.epdc.dto.GroupUserBannedFormDTO;
+import com.elink.esua.epdc.dto.GroupUserManagerFormDTO;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
+import com.elink.esua.epdc.dto.constant.PartyGroupConstant;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
+import com.elink.esua.epdc.enums.BannedEnum;
 import com.elink.esua.epdc.redis.PartyUserGroupRedis;
 import com.elink.esua.epdc.service.PartyUserGroupService;
 import org.apache.commons.lang3.StringUtils;
@@ -34,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -101,4 +109,72 @@ public class PartyUserGroupServiceImpl extends BaseServiceImpl<PartyUserGroupDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PartyUserGroupDTO getManagerByGroupId(String groupId) {
+        return baseDao.getManagerByGroupId(groupId);
+    }
+
+    @Override
+    public PartyUserGroupDTO getUserByGroupIdAndUserId(String groupId, String userId) {
+        return baseDao.getUserByGroupIdAndUserId(groupId,userId);
+    }
+
+    @Override
+    public PageData<PartyUserGroupDTO> listPage(Map<String, Object> params) {
+        IPage<PartyUserGroupDTO> page = getPage(params);
+        List<PartyUserGroupDTO> list = baseDao.getPartyUserGroupPageFromPC(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result modifyBannedState(GroupUserBannedFormDTO formDto) {
+        PartyUserGroupEntity entity = new PartyUserGroupEntity();
+        entity.setId(formDto.getId());
+        //设置禁言时长
+        if(BannedEnum.BANNED_NO.getValue().equals(formDto.getBannedFlag())){
+            entity.setBannedStartTime(new Date());
+            entity.setBannedEndTime(new Date());
+        }else if (BannedEnum.BANNED_DAY.getValue().equals(formDto.getBannedFlag())){
+            entity.setBannedStartTime(new Date());
+            entity.setBannedEndTime(DateUtils.addDateDays(new Date(),1));
+        }else if (BannedEnum.BANNED_WEEK.getValue().equals(formDto.getBannedFlag())){
+            entity.setBannedStartTime(new Date());
+            entity.setBannedEndTime(DateUtils.addDateWeeks(new Date(),1));
+        }else if (BannedEnum.BANNED_MONTH.getValue().equals(formDto.getBannedFlag())){
+            entity.setBannedStartTime(new Date());
+            entity.setBannedEndTime(DateUtils.addDateMonths(new Date(),1));
+        }else if (BannedEnum.BANNED_FOREVER.getValue().equals(formDto.getBannedFlag())){
+            entity.setBannedStartTime(new Date());
+            entity.setBannedEndTime(DateUtils.addDateYears(new Date(),100));
+        }
+        updateById(entity);
+        return new Result();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result modifyGroupManagerState(GroupUserManagerFormDTO formDto) {
+        //判断是否是指定群主操作
+        if(PartyGroupConstant.PARTY_GROUP_IDENTITY_FLAG.equals(formDto.getIdentityFlag())){
+            //先将之前的群主身份取消为群成员
+            PartyUserGroupDTO partyUserGroupDTO = get(formDto.getGroupUserId());
+            if(partyUserGroupDTO==null){
+                throw new RenException("获取成员党群信息异常");
+            }
+            //获取之前的群主信息
+            PartyUserGroupDTO managerByGroupId = getManagerByGroupId(partyUserGroupDTO.getPartyGroupId());
+            if(managerByGroupId!=null){
+                managerByGroupId.setIdentityFlag("0");
+                updateById(ConvertUtils.sourceToTarget(managerByGroupId,PartyUserGroupEntity.class));
+            }
+        }
+        //更新当前用户身份
+        PartyUserGroupEntity entity = new PartyUserGroupEntity();
+        entity.setId(formDto.getGroupUserId());
+        entity.setIdentityFlag(formDto.getIdentityFlag());
+        updateById(entity);
+        return new Result();
+    }
+
 }

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

@@ -35,5 +35,55 @@
             AND find_in_set(#{deptId},ALL_DEPT_IDS)
     </select>
 
+    <select id="selectListOfPartyGroupDTO" resultType="com.elink.esua.epdc.dto.PartyGroupDTO">
+          select
+            t.ID,
+            t.PARTY_GROUP_NAME,
+            t.PARTY_GROUP_AVATAR,
+            t.GROUP_INTRODUCTION,
+            t.DEPT,
+            t.DEPT_ID,
+            t.STATE,
+            t.ALL_DEPT_IDS,
+            t.ALL_DEPT_NAMES,
+            t.PARENT_DEPT_IDS,
+            t.PARENT_DEPT_NAMES,
+            t.DEL_FLAG,
+            t.REVISION,
+            t.CREATED_BY,
+            t.CREATED_TIME,
+            t.UPDATED_BY,
+            t.UPDATED_TIME,
+            t1.NICKNAME
+        from epdc_party_group t
+        left join (select PARTY_GROUP_ID,NICKNAME from epdc_party_user_group where IDENTITY_FLAG = '1' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID
+        where t.DEL_FLAG ='0'
+        order by CREATED_TIME desc
+    </select>
 
+    <select id="selectDetailById" resultType="com.elink.esua.epdc.dto.PartyGroupDTO">
+         select
+            t.ID,
+            t.PARTY_GROUP_NAME,
+            t.PARTY_GROUP_AVATAR,
+            t.GROUP_INTRODUCTION,
+            t.DEPT,
+            t.DEPT_ID,
+            t.STATE,
+            t.ALL_DEPT_IDS,
+            t.ALL_DEPT_NAMES,
+            t.PARENT_DEPT_IDS,
+            t.PARENT_DEPT_NAMES,
+            t.DEL_FLAG,
+            t.REVISION,
+            t.CREATED_BY,
+            t.CREATED_TIME,
+            t.UPDATED_BY,
+            t.UPDATED_TIME,
+            t1.NICKNAME,
+            t1.USER_ID
+        from epdc_party_group t
+        left join (select PARTY_GROUP_ID,NICKNAME,USER_ID from epdc_party_user_group where IDENTITY_FLAG = '1' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID
+        where t.DEL_FLAG ='0' and t.ID = #{id}
+    </select>
 </mapper>

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

@@ -51,6 +51,7 @@
             AND (GRID_ID = #{gridId}
             OR find_in_set(#{gridId},ALL_DEPT_IDS))
         </if>
+        order by  CREATED_TIME desc
     </select>
 
 </mapper>

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

@@ -79,6 +79,7 @@
         <if test="endTime != null and endTime != '' ">
             <![CDATA[ and t.CREATED_TIME <= ]]> #{endTime}
         </if>
+        order by  CREATED_TIME desc
     </select>
 
     <resultMap id="topicDetail" type="com.elink.esua.epdc.dto.PartyTopicDTO">

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

@@ -25,4 +25,110 @@
     </resultMap>
 
 
+    <select id="getManagerByGroupId" resultType="com.elink.esua.epdc.dto.PartyUserGroupDTO">
+        select
+            ID,
+           PARTY_GROUP_ID,
+           USER_ID,
+           NICKNAME,
+           USER_AVATAR,
+           MOBILE,
+           IDENTITY_FLAG,
+           PARTY_MEMBER,
+           STATE,
+           REMARK,
+           BANNED_START_TIME,
+           BANNED_END_TIME,
+           DEL_FLAG,
+           REVISION,
+           CREATED_BY,
+           CREATED_TIME,
+           UPDATED_BY,
+           UPDATED_TIME
+        from epdc_party_user_group
+        where DEL_FLAG='0' and PARTY_GROUP_ID = #{groupId} and IDENTITY_FLAG = '1'
+    </select>
+
+    <select id="getUserByGroupIdAndUserId" resultType="com.elink.esua.epdc.dto.PartyUserGroupDTO">
+      select
+            ID,
+           PARTY_GROUP_ID,
+           USER_ID,
+           NICKNAME,
+           USER_AVATAR,
+           MOBILE,
+           IDENTITY_FLAG,
+           PARTY_MEMBER,
+           STATE,
+           REMARK,
+           BANNED_START_TIME,
+           BANNED_END_TIME,
+           DEL_FLAG,
+           REVISION,
+           CREATED_BY,
+           CREATED_TIME,
+           UPDATED_BY,
+           UPDATED_TIME
+        from epdc_party_user_group
+        where DEL_FLAG='0' and PARTY_GROUP_ID = #{groupId} and USER_ID = #{userId}
+    </select>
+
+    <select id="getPartyUserGroupPageFromPC" resultType="com.elink.esua.epdc.dto.PartyUserGroupDTO">
+        select
+        ID,
+        PARTY_GROUP_ID,
+        USER_ID,
+        NICKNAME,
+        USER_AVATAR,
+        MOBILE,
+        IDENTITY_FLAG,
+        PARTY_MEMBER,
+        STATE,
+        REMARK,
+        BANNED_START_TIME,
+        BANNED_END_TIME,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME,
+        GRID,
+        ((case when bannedTime = 0
+        then '未禁言'
+        when bannedTime = 1
+        then '禁言一天'
+        when bannedTime = 7
+        then '禁言一周'
+        when bannedTime >= 28 and bannedTime &lt;= 31
+        then '禁言一月'
+        when bannedTime > 31
+        then '永久禁言'
+        else '未禁言'
+        END )) as bannedState
+        from (select  ID,
+        PARTY_GROUP_ID,
+        USER_ID,
+        NICKNAME,
+        USER_AVATAR,
+        MOBILE,
+        IDENTITY_FLAG,
+        PARTY_MEMBER,
+        STATE,
+        REMARK,
+        BANNED_START_TIME,
+        BANNED_END_TIME,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME,
+        GRID,DATEDIFF(BANNED_END_TIME,BANNED_START_TIME) as bannedTime from epdc_party_user_group)a
+        where DEL_FLAG='0'
+         <if test="partyGroupId != null and partyGroupId!=''">
+            and PARTY_GROUP_ID = #{partyGroupId}
+         </if>
+         order by CREATED_TIME desc
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -178,4 +178,16 @@ public class UserController {
         return userService.handleUserPoints(formDTO);
     }
 
+
+    /**
+     * @Description  获取已认证未删除用户列表
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.UserDTO>>
+     **/
+    @GetMapping("getUserList/{deptId}")
+    public Result<List<UserDTO>> getUserList(@PathVariable("deptId") Long deptId) {
+        return userService.getUserList(deptId);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java

@@ -102,6 +102,18 @@ public class UserGridRelationController {
         UserGridRelationDTO data = userGridRelationService.getUserLastSwitchGird(userId);
         return new Result<UserGridRelationDTO>().ok(data);
     }
+    /**
+     * @Description  获取用户第一次扫码网格的信息
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     **/
+    @GetMapping("getUserFirstScanGird/{userId}")
+    public Result<UserGridRelationDTO> getUserFirstScanGird(@PathVariable("userId") String userId){
+        UserGridRelationDTO data = userGridRelationService.getUserFirstScanGird(userId);
+        return new Result<UserGridRelationDTO>().ok(data);
+    }
     
     /**
      * @param id epdc_user_grid_relation表主键

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
@@ -196,4 +197,12 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/18 14:12
      **/
     CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+    /**
+     * @Description  获取指定部门下未删除已认证用户列表
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param []
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     **/
+    List<UserDTO> getUserList(Long deptId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java

@@ -66,4 +66,12 @@ public interface UserGridRelationDao extends BaseDao<UserGridRelationEntity> {
      * @since 2020/3/7 1:20
      */
     void updateGridByDeptId(String newDeptName, Long deptId);
+    /**
+     * @Description   获取用户第一次扫码网格的信息
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [userId]
+     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     **/
+    UserGridRelationDTO getUserFirstScanGrid(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java

@@ -188,4 +188,12 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
+    /**
+     * @Description   获取用户第一次扫码网格的信息
+     * @Author songyunpeng
+     * @Date  2020/6/2
+     * @Param [userId]
+     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     **/
+    UserGridRelationDTO getUserFirstScanGird(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -306,4 +306,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @Date 2019/12/18 14:01
      **/
     Result<CachingUserInfoDTO> queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
+    /**
+     * @Description   获取已认证未删除用户列表
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.UserDTO>>
+     **/
+    Result<List<UserDTO>> getUserList(Long deptId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java

@@ -233,6 +233,11 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
         baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
     }
 
+    @Override
+    public UserGridRelationDTO getUserFirstScanGird(String userId) {
+        return baseDao.getUserFirstScanGrid(userId);
+    }
+
     /**
      *
      * 组织机构信息处理

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -1015,4 +1015,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
     }
 
+    @Override
+    public Result<List<UserDTO>> getUserList(Long deptId) {
+        List<UserDTO> list = baseDao.getUserList(deptId);
+        return new Result<List<UserDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -500,4 +500,9 @@
         </if>
     </select>
 
+    <select id="getUserList" resultType="com.elink.esua.epdc.dto.UserDTO">
+        select ID,NICKNAME,MOBILE,PARTY_FLAG,FACE_IMG from epdc_user
+        where DEL_FLAG = '0' and STATE != '0' and FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml

@@ -33,4 +33,24 @@
         UPDATE epdc_user_grid_relation SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
     </update>
 
+    <select id="getUserFirstScanGrid" resultType="com.elink.esua.epdc.dto.UserGridRelationDTO">
+        SELECT
+            ID,
+            GRID,
+            GRID_ID,
+            PARENT_DEPT_IDS,
+            PARENT_DEPT_NAMES,
+            ALL_DEPT_IDS,
+            ALL_DEPT_NAMES
+        FROM
+            `epdc_user_grid_relation`
+        WHERE
+            USER_ID = #{userId}
+            AND DEL_FLAG = '0'
+        ORDER BY
+            CREATED_TIME
+            LIMIT 1
+    </select>
+
+
 </mapper>