群

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

@@ -34,6 +34,7 @@ public class GroupChatUserDTO implements Serializable{
 	private String memberId;
 	/**邀请者*/
 	private String invitorUserId;
+	private String invitorUserName ;
 	private java.util.Date createTime;
 	private java.util.Date updateTime;
 	/**1是0否*/
@@ -53,7 +54,15 @@ public class GroupChatUserDTO implements Serializable{
 	private String joinState;
 	private Integer adminFlag ;
 	
-	public Integer getAdminFlag() {
+	public String getInvitorUserName() {
+        return invitorUserName;
+    }
+
+    public void setInvitorUserName(String invitorUserName) {
+        this.invitorUserName = invitorUserName;
+    }
+
+    public Integer getAdminFlag() {
         return adminFlag;
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatUserBO.java

-package com.gic.haoban.manage.service.pojo.bo.chat;
-
-import java.io.Serializable ;
-
-/**
- * 
- * @ClassName: TabHaobanGroupChatUser
- * @Description: TODO
- * @Author 徐高华
- * @Date 2022年11月25日 15:42:52
- * @Modify
- * @CopyRight 
- */
-public class GroupChatUserBO implements Serializable{
-
-	private static final long serialVersionUID = 21771431486600L;
-	
-	private Long chatUserId;
-	/**微信企业id*/
-	private String wxEnterpriseId;
-	private String enterpriseId;
-	/**1企业成员2外部联系人3客户*/
-	private Integer userType;
-	/**入群时间*/
-	private java.util.Date joinTime;
-	/**姓名*/
-	private String userName;
-	/**昵称*/
-	private String nickName;
-	/**群成员id*/
-	private String userId;
-	/**unionid*/
-	private String unionid;
-	private String memberId;
-	/**邀请者*/
-	private String invitorUserId;
-	private java.util.Date createTime;
-	private java.util.Date updateTime;
-	/**1是0否*/
-	private Integer deleteFlag;
-	/**群id*/
-	private Long groupChatId;
-	/**1有效 2已退群*/
-	private Integer statusFlag;
-	/**用户退群时间*/
-	private java.util.Date userQuitTime;
-	/**0自己退群 1 - 群主/群管理员移出*/
-	private Integer quitScene;
-	/**0 - 由成员邀请入群（包括直接邀请入群和通过邀请链接入群）3 - 通过扫描群二维码入群*/
-	private Integer joinScene;
-	/**入群说明*/
-	private String joinRemark;
-	private String joinState;
-	
-	public void setChatUserId(Long chatUserId){
-		this.chatUserId = chatUserId;
-	}
-	
-	public Long getChatUserId(){
-		return chatUserId;
-	}
-	public void setWxEnterpriseId(String wxEnterpriseId){
-		this.wxEnterpriseId = wxEnterpriseId;
-	}
-	
-	public String getWxEnterpriseId(){
-		return wxEnterpriseId;
-	}
-	public void setEnterpriseId(String enterpriseId){
-		this.enterpriseId = enterpriseId;
-	}
-	
-	public String getEnterpriseId(){
-		return enterpriseId;
-	}
-	public void setUserType(Integer userType){
-		this.userType = userType;
-	}
-	
-	public Integer getUserType(){
-		return userType;
-	}
-	public void setJoinTime(java.util.Date joinTime){
-		this.joinTime = joinTime;
-	}
-	
-	public java.util.Date getJoinTime(){
-		return joinTime;
-	}
-	public void setUserName(String userName){
-		this.userName = userName;
-	}
-	
-	public String getUserName(){
-		return userName;
-	}
-	public void setNickName(String nickName){
-		this.nickName = nickName;
-	}
-	
-	public String getNickName(){
-		return nickName;
-	}
-	public void setUserId(String userId){
-		this.userId = userId;
-	}
-	
-	public String getUserId(){
-		return userId;
-	}
-	public void setUnionid(String unionid){
-		this.unionid = unionid;
-	}
-	
-	public String getUnionid(){
-		return unionid;
-	}
-	public void setMemberId(String memberId){
-		this.memberId = memberId;
-	}
-	
-	public String getMemberId(){
-		return memberId;
-	}
-	public void setInvitorUserId(String invitorUserId){
-		this.invitorUserId = invitorUserId;
-	}
-	
-	public String getInvitorUserId(){
-		return invitorUserId;
-	}
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return createTime;
-	}
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return updateTime;
-	}
-	public void setDeleteFlag(Integer deleteFlag){
-		this.deleteFlag = deleteFlag;
-	}
-	
-	public Integer getDeleteFlag(){
-		return deleteFlag;
-	}
-	public void setGroupChatId(Long groupChatId){
-		this.groupChatId = groupChatId;
-	}
-	
-	public Long getGroupChatId(){
-		return groupChatId;
-	}
-	public void setStatusFlag(Integer statusFlag){
-		this.statusFlag = statusFlag;
-	}
-	
-	public Integer getStatusFlag(){
-		return statusFlag;
-	}
-	public void setUserQuitTime(java.util.Date userQuitTime){
-		this.userQuitTime = userQuitTime;
-	}
-	
-	public java.util.Date getUserQuitTime(){
-		return userQuitTime;
-	}
-	public void setQuitScene(Integer quitScene){
-		this.quitScene = quitScene;
-	}
-	
-	public Integer getQuitScene(){
-		return quitScene;
-	}
-	public void setJoinScene(Integer joinScene){
-		this.joinScene = joinScene;
-	}
-	
-	public Integer getJoinScene(){
-		return joinScene;
-	}
-	public void setJoinRemark(String joinRemark){
-		this.joinRemark = joinRemark;
-	}
-	
-	public String getJoinRemark(){
-		return joinRemark;
-	}
-	public void setJoinState(String joinState){
-		this.joinState = joinState;
-	}
-	
-	public String getJoinState(){
-		return joinState;
-	}
-}
\ No newline at end of file

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

@@ -25,7 +25,6 @@ import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 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.StaffService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.service.chat.GroupChatUserService;

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

@@ -15,6 +15,7 @@
 		<result column="unionid" property="unionid" />
 		<result column="member_id" property="memberId" />
 		<result column="invitor_user_id" property="invitorUserId" />
+		<result column="invitor_user_name" property="invitorUserName"/>
 		<result column="create_time" property="createTime" />
 		<result column="update_time" property="updateTime" />
 		<result column="delete_flag" property="deleteFlag" />
@@ -47,7 +48,7 @@
 		quit_scene,
 		join_scene,
 		join_remark,
-		join_state
+		join_state , invitor_user_name
 	</sql>
 	<!-- ===================== 新增 ======================== -->
 	<insert id="insert"
@@ -74,29 +75,29 @@
 	  quit_scene,
 	  join_scene,
 	  join_remark,
-	  join_state
+	  join_state , invitor_user_name
   )VALUES(
-	  #{chatUserId,jdbcType=BIGINT},
-	  #{wxEnterpriseId,jdbcType=CHAR},
-	  #{enterpriseId,jdbcType=CHAR},
-	  #{userType,jdbcType=INTEGER},
-	  #{joinTime,jdbcType=DATE},
-	  #{userName,jdbcType=VARCHAR},
-	  #{nickName,jdbcType=VARCHAR},
-	  #{userId,jdbcType=VARCHAR},
-	  #{unionid,jdbcType=VARCHAR},
-	  #{memberId,jdbcType=VARCHAR},
-	  #{invitorUserId,jdbcType=VARCHAR},
-	  #{createTime,jdbcType=TIMESTAMP},
-	  #{updateTime,jdbcType=TIMESTAMP},
-	  #{deleteFlag,jdbcType=INTEGER},
-	  #{groupChatId,jdbcType=BIGINT},
-	  #{statusFlag,jdbcType=INTEGER},
-	  #{userQuitTime,jdbcType=TIMESTAMP},
-	  #{quitScene,jdbcType=INTEGER},
-	  #{joinScene,jdbcType=INTEGER},
-	  #{joinRemark,jdbcType=VARCHAR},
-	  #{joinState,jdbcType=VARCHAR}
+	  #{chatUserId},
+	  #{wxEnterpriseId},
+	  #{enterpriseId},
+	  #{userType},
+	  #{joinTime},
+	  #{userName},
+	  #{nickName},
+	  #{userId},
+	  #{unionid},
+	  #{memberId},
+	  #{invitorUserId},
+	  #{createTime},
+	  #{updateTime},
+	  #{deleteFlag},
+	  #{groupChatId},
+	  #{statusFlag},
+	  #{userQuitTime},
+	  #{quitScene},
+	  #{joinScene},
+	  #{joinRemark},
+	  #{joinState} , #{invitorUserName}
   )
   ]]>
 	</insert>
@@ -115,22 +116,22 @@
 		parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatUser">
 	  <![CDATA[
 	  UPDATE tab_haoban_group_chat_user SET
-		  user_type=#{userType,jdbcType=INTEGER},
-		  join_time=#{joinTime,jdbcType=DATE},
-		  user_name=#{userName,jdbcType=VARCHAR},
-		  nick_name=#{nickName,jdbcType=VARCHAR},
-		  user_id=#{userId,jdbcType=VARCHAR},
-		  unionid=#{unionid,jdbcType=VARCHAR},
-		  member_id=#{memberId,jdbcType=VARCHAR},
-		  invitor_user_id=#{invitorUserId,jdbcType=VARCHAR},
+		  user_type=#{userType},
+		  join_time=#{joinTime},
+		  user_name=#{userName},
+		  nick_name=#{nickName},
+		  user_id=#{userId},
+		  unionid=#{unionid},
+		  member_id=#{memberId},
+		  invitor_user_id=#{invitorUserId},
 		  update_time=now(),
-		  group_chat_id=#{groupChatId,jdbcType=BIGINT},
-		  status_flag=#{statusFlag,jdbcType=INTEGER},
-		  user_quit_time=#{userQuitTime,jdbcType=TIMESTAMP},
-		  quit_scene=#{quitScene,jdbcType=INTEGER},
-		  join_scene=#{joinScene,jdbcType=INTEGER},
-		  join_remark=#{joinRemark,jdbcType=VARCHAR},
-		  join_state=#{joinState,jdbcType=VARCHAR}
+		  group_chat_id=#{groupChatId},
+		  status_flag=#{statusFlag},
+		  user_quit_time=#{userQuitTime},
+		  quit_scene=#{quitScene},
+		  join_scene=#{joinScene},
+		  join_remark=#{joinRemark},
+		  join_state=#{joinState}
 	  where chat_user_id = #{chatUserId}
 	  ]]>
 	</update>
@@ -164,6 +165,7 @@
 			a.nick_name nickName ,
 			a.member_id memberId ,
 			a.invitor_user_id invitorUserId,
+			a.invitor_user_name invitorUserName ,
 			a.user_quit_time userQuitTime,
 			a.join_scene joinScene,
 			a.join_state joinState 
@@ -188,7 +190,6 @@
 				and (b.name like '%${searchParams}%' or c.staff_name like '%${searchParams}%')
 			</if>
 		</if>
-		
 	</select>
 	
 </mapper> 
\ No newline at end of file