群成员查询

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatDTO.java

@@ -52,8 +52,26 @@ public class GroupChatDTO implements Serializable{
 	private String enterpriseId;
 	/**gic侧状态1可用,2不可用*/
 	private Integer gicFlag;
+	private String staffName ;
+	private String originalStaffId ;
 	
-	public void setGroupChatId(Long groupChatId){
+	public String getOriginalStaffId() {
+        return originalStaffId;
+    }
+
+    public void setOriginalStaffId(String originalStaffId) {
+        this.originalStaffId = originalStaffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setGroupChatId(Long groupChatId){
 		this.groupChatId = groupChatId;
 	}
 	

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatUserSearchQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.chat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class GroupChatUserSearchQDTO implements Serializable {
+
+    private static final long serialVersionUID = 7983127960892502325L;
+
+    private Date startDate;
+    private Date endDate;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String searchParams;
+    // 群状态 0跟进人正常1跟进人离职2离职继承中 4已解散
+    private Integer status;
+    private Date dismissStartDate;
+    private Date dismissEndDate;
+    // 群主列表
+    private List<String> staffIdList;
+
+    public Date getDismissStartDate() {
+        return dismissStartDate;
+    }
+
+    public Date getDismissEndDate() {
+        return dismissEndDate;
+    }
+
+    public List<String> getStaffIdList() {
+        return staffIdList;
+    }
+
+    public void setDismissStartDate(Date dismissStartDate) {
+        this.dismissStartDate = dismissStartDate;
+    }
+
+    public void setDismissEndDate(Date dismissEndDate) {
+        this.dismissEndDate = dismissEndDate;
+    }
+
+    public void setStaffIdList(List<String> staffIdList) {
+        this.staffIdList = staffIdList;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public String getSearchParams() {
+        return searchParams;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setSearchParams(String searchParams) {
+        this.searchParams = searchParams;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatApiService.java

@@ -7,7 +7,9 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 
 public interface GroupChatApiService {
 
@@ -22,6 +24,18 @@ public interface GroupChatApiService {
     * @throws
      */
     public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo);
+    
+    /**
+     * 
+    * @Title: listUserPage
+    * @Description: 群成员列表查询
+    * @author xugh
+    * @param qdto
+    * @param basePageInfo
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Page<GroupChatUserDTO>> listUserPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo);
 
     /**
      * 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatUserMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
 
 /**
@@ -30,5 +31,7 @@ public interface GroupChatUserMapper {
 
     public List<TabGroupChatUser> listAllChatUser(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("groupChatId") Long groupChatId);
+    
+    public List<TabGroupChatUser> listPage(GroupChatUserSearchQDTO qdto);
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatUserService.java

 package com.gic.haoban.manage.service.service.chat;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatUserBO;
+
 public interface GroupChatUserService {
-	
+
+    Page<GroupChatUserBO> listPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo);
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatUserServiceImpl.java

 package com.gic.haoban.manage.service.service.chat.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
+import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatUserMapper;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatUserBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatUserService;
+import com.github.pagehelper.PageHelper;
 
 @Service
-public class GroupChatUserServiceImpl implements GroupChatUserService{
-	
+public class GroupChatUserServiceImpl implements GroupChatUserService {
+    
+    @Autowired
+    private GroupChatUserMapper groupChatUserMapper ;
+    
+    @Override
+    public Page<GroupChatUserBO> listPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<TabGroupChatUser> list = this.groupChatUserMapper.listPage(qdto);
+        Page<GroupChatUserBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatUserBO.class);
+        return retPage;
+    }
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatApiServiceImpl.java

@@ -15,10 +15,14 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatUserBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
+import com.gic.haoban.manage.service.service.chat.GroupChatUserService;
 
 @Service("groupChatApiService")
 public class GroupChatApiServiceImpl implements GroupChatApiService {
@@ -27,6 +31,8 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
 
     @Autowired
     private GroupChatService groupChatService;
+    @Autowired
+    private GroupChatUserService groupChatUserService ;
 
     @Override
     public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -34,6 +40,14 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         Page<GroupChatDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatDTO.class);
         return ServiceResponse.success(resultPage);
     }
+    
+    @Override
+    public ServiceResponse<Page<GroupChatUserDTO>> listUserPage(GroupChatUserSearchQDTO qdto,
+            BasePageInfo basePageInfo) {
+        Page<GroupChatUserBO> page = this.groupChatUserService.listPage(qdto, basePageInfo);
+        Page<GroupChatUserDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatUserDTO.class);
+        return ServiceResponse.success(resultPage);
+    }
 
     @Override
     public ServiceResponse<GroupChatDTO> detail(String wxEnterpriseId, Long groupChatId) {

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -152,4 +152,9 @@
 	<select id="listAllChatUser" resultMap="result-map-tabHaobanGroupChatUser">
 		select <include refid="Base_Column_List" /> from tab_haoban_group_chat_user where group_chat_id = #{groupChatId} and wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1  and delete_flag = 0
 	</select>
+	
+	<select id="listPage" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO" resultMap="result-map-tabHaobanGroupChatUser">
+		select <include refid="Base_Column_List" /> from tab_haoban_group_chat_user where group_chat_id = #{groupChatId} and wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1  and delete_flag = 0
+	</select>
+	
 </mapper> 
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

@@ -13,7 +13,9 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 
 /**
@@ -48,6 +50,15 @@ public class GroupChatController {
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
     }
+    
+    @RequestMapping("user/page")
+    public RestResponse<Object> userPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        ServiceResponse<Page<GroupChatUserDTO>> page = this.groupChatApiService.listUserPage(qdto, basePageInfo);
+        return RestResponse.successResult(page.getResult());
+    } 
 
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long groupChatId) {