列表查询

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

@@ -16,7 +16,7 @@ public class GroupChatUserSearchQDTO implements Serializable {
     private String enterpriseId;
     private String searchParams;
     // 群状态 1有效2已退群
-    private Integer status;
+    private Integer status = 1;
     public Date getStartDate() {
         return startDate;
     }

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.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
 
@@ -32,6 +33,6 @@ public interface GroupChatUserMapper {
     public List<TabGroupChatUser> listAllChatUser(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("groupChatId") Long groupChatId);
     
-    public List<TabGroupChatUser> listPage(GroupChatUserSearchQDTO qdto);
+    public List<GroupChatUserDTO> listPage(GroupChatUserSearchQDTO qdto);
 
 }
\ No newline at end of file

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

@@ -2,11 +2,11 @@ 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.chat.GroupChatUserDTO;
 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);
+    Page<GroupChatUserDTO> 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

@@ -8,10 +8,9 @@ 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.chat.GroupChatUserDTO;
 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;
 
@@ -22,10 +21,10 @@ public class GroupChatUserServiceImpl implements GroupChatUserService {
     private GroupChatUserMapper groupChatUserMapper ;
     
     @Override
-    public Page<GroupChatUserBO> listPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo) {
+    public Page<GroupChatUserDTO> listPage(GroupChatUserSearchQDTO qdto, BasePageInfo basePageInfo) {
         PageHelper.startPage(basePageInfo);
-        List<TabGroupChatUser> list = this.groupChatUserMapper.listPage(qdto);
-        Page<GroupChatUserBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatUserBO.class);
+        List<GroupChatUserDTO> list = this.groupChatUserMapper.listPage(qdto);
+        Page<GroupChatUserDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatUserDTO.class);
         return retPage;
     }
 

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

@@ -52,9 +52,8 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
     @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);
+        Page<GroupChatUserDTO> page = this.groupChatUserService.listPage(qdto, basePageInfo);
+        return ServiceResponse.success(page);
     }
 
     @Override

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

@@ -153,8 +153,42 @@
 		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 id="listPage" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO">
+		select 
+			b.name chatName ,
+			c.staff_name staffName ,
+			a.chat_user_id chatUserId ,
+			a.user_type userType ,
+			a.join_time joinTime ,
+			a.user_name user_name ,
+			a.nick_name nickName ,
+			a.member_id memberId ,
+			a.invitor_user_id invitorUserId,
+			a.user_quit_time userQuitTime,
+			a.join_scene joinScene,
+			a.join_state joinState 
+			from tab_haoban_group_chat_user a
+			left join tab_haoban_group_chat b on a.group_chat_id = b.group_chat_id 
+			left join tab_haoban_staff c on b.staff_id = c.staff_id 
+			where a.wx_enterprise_id = #{wxEnterpriseId}  and a.delete_flag = 0
+			<if test="null != groupChatId">
+				and a.group_chat_id = #{groupChatId} 
+			</if>
+	    <!-- 正常 -->
+		<if test="status==1">
+			 and a.status_flag = 1  
+		</if>
+		<!-- 退群记录 -->
+		<if test="status == 2">
+			 and  a.status_flag = 2  
+			<if test="null != startDate">
+				and a.user_quit_time <![CDATA[>=]]> #{startDate} and a.user_quit_time <![CDATA[<=]]> #{endDate}
+			</if>
+			<if test="null != searchParams">
+				and (b.name like '%${searchParams}%' or c.staff_name like '%${searchParams}%')
+			</if>
+		</if>
+		
 	</select>
 	
 </mapper> 
\ No newline at end of file