Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !530

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

 package com.gic.haoban.manage.api.dto.chat;
 
 import java.io.Serializable ;
+import java.util.Date;
 
 /**
  * 
@@ -54,8 +55,17 @@ public class GroupChatDTO implements Serializable{
 	private Integer gicFlag;
 	private String staffName ;
 	private String originalStaffId ;
+	private Date offTime ;
 	
-	public String getOriginalStaffId() {
+	public Date getOffTime() {
+        return offTime;
+    }
+
+    public void setOffTime(Date offTime) {
+        this.offTime = offTime;
+    }
+
+    public String getOriginalStaffId() {
         return originalStaffId;
     }
 

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

 package com.gic.haoban.manage.api.dto.chat;
 
-import java.io.Serializable ;
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * 
@@ -11,183 +12,203 @@ import java.io.Serializable ;
  * @Modify
  * @CopyRight 
  */
-public class GroupChatHmDTO implements Serializable{
-
-	private static final long serialVersionUID = 21518878229500L;
-	
-	private Long chatHmId;
-	private String chatHmCode;
-	private String wxEnterpriseId;
-	private String enterpriseId;
-	private String name;
-	private String remark;
-	/**0-否；1-是*/
-	private Integer autoCreateRoom;
-	/**自动建群的群起始序号*/
-	private Integer roomBaseId;
-	/**自动建群的群名前缀*/
-	private String roomBaseName;
-	private String wxConfigId;
-	private String wxQrCode;
-	private String creatorId;
-	private String creatorName;
-	private String modifierId;
-	private String modifierName;
-	private Integer deleteFlag;
-	private java.util.Date createTime;
-	private java.util.Date updateTime;
-	/**关联群数量*/
-	private Integer chatCount;
-	/**关联群id列表*/
-	private String chatIdList;
-	/**已关联链接数*/
-	private Integer linkCount;
-	
-	public void setChatHmId(Long chatHmId){
-		this.chatHmId = chatHmId;
-	}
-	
-	public Long getChatHmId(){
-		return chatHmId;
-	}
-	public void setChatHmCode(String chatHmCode){
-		this.chatHmCode = chatHmCode;
-	}
-	
-	public String getChatHmCode(){
-		return chatHmCode;
-	}
-	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 setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return name;
-	}
-	public void setRemark(String remark){
-		this.remark = remark;
-	}
-	
-	public String getRemark(){
-		return remark;
-	}
-	public void setAutoCreateRoom(Integer autoCreateRoom){
-		this.autoCreateRoom = autoCreateRoom;
-	}
-	
-	public Integer getAutoCreateRoom(){
-		return autoCreateRoom;
-	}
-	public void setRoomBaseId(Integer roomBaseId){
-		this.roomBaseId = roomBaseId;
-	}
-	
-	public Integer getRoomBaseId(){
-		return roomBaseId;
-	}
-	public void setRoomBaseName(String roomBaseName){
-		this.roomBaseName = roomBaseName;
-	}
-	
-	public String getRoomBaseName(){
-		return roomBaseName;
-	}
-	public void setWxConfigId(String wxConfigId){
-		this.wxConfigId = wxConfigId;
-	}
-	
-	public String getWxConfigId(){
-		return wxConfigId;
-	}
-	public void setWxQrCode(String wxQrCode){
-		this.wxQrCode = wxQrCode;
-	}
-	
-	public String getWxQrCode(){
-		return wxQrCode;
-	}
-	public void setCreatorId(String creatorId){
-		this.creatorId = creatorId;
-	}
-	
-	public String getCreatorId(){
-		return creatorId;
-	}
-	public void setCreatorName(String creatorName){
-		this.creatorName = creatorName;
-	}
-	
-	public String getCreatorName(){
-		return creatorName;
-	}
-	public void setModifierId(String modifierId){
-		this.modifierId = modifierId;
-	}
-	
-	public String getModifierId(){
-		return modifierId;
-	}
-	public void setModifierName(String modifierName){
-		this.modifierName = modifierName;
-	}
-	
-	public String getModifierName(){
-		return modifierName;
-	}
-	public void setDeleteFlag(Integer deleteFlag){
-		this.deleteFlag = deleteFlag;
-	}
-	
-	public Integer getDeleteFlag(){
-		return deleteFlag;
-	}
-	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 setChatCount(Integer chatCount){
-		this.chatCount = chatCount;
-	}
-	
-	public Integer getChatCount(){
-		return chatCount;
-	}
-	public void setChatIdList(String chatIdList){
-		this.chatIdList = chatIdList;
-	}
-	
-	public String getChatIdList(){
-		return chatIdList;
-	}
-	public void setLinkCount(Integer linkCount){
-		this.linkCount = linkCount;
-	}
-	
-	public Integer getLinkCount(){
-		return linkCount;
-	}
+public class GroupChatHmDTO implements Serializable {
+
+    private static final long serialVersionUID = 21518878229500L;
+
+    private Long chatHmId;
+    private String chatHmCode;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String name;
+    private String remark;
+    /**0-否；1-是*/
+    private Integer autoCreateRoom;
+    /**自动建群的群起始序号*/
+    private Integer roomBaseId;
+    /**自动建群的群名前缀*/
+    private String roomBaseName;
+    private String wxConfigId;
+    private String wxQrCode;
+    private String creatorId;
+    private String creatorName;
+    private String modifierId;
+    private String modifierName;
+    private Integer deleteFlag;
+    private java.util.Date createTime;
+    private java.util.Date updateTime;
+    /**关联群数量*/
+    private Integer chatCount;
+    /**关联群id列表*/
+    private List<Long> chatIdList;
+    /**已关联链接数*/
+    private Integer linkCount;
+
+    public void setChatHmId(Long chatHmId) {
+        this.chatHmId = chatHmId;
+    }
+
+    public Long getChatHmId() {
+        return chatHmId;
+    }
+
+    public void setChatHmCode(String chatHmCode) {
+        this.chatHmCode = chatHmCode;
+    }
+
+    public String getChatHmCode() {
+        return chatHmCode;
+    }
+
+    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 setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setAutoCreateRoom(Integer autoCreateRoom) {
+        this.autoCreateRoom = autoCreateRoom;
+    }
+
+    public Integer getAutoCreateRoom() {
+        return autoCreateRoom;
+    }
+
+    public void setRoomBaseId(Integer roomBaseId) {
+        this.roomBaseId = roomBaseId;
+    }
+
+    public Integer getRoomBaseId() {
+        return roomBaseId;
+    }
+
+    public void setRoomBaseName(String roomBaseName) {
+        this.roomBaseName = roomBaseName;
+    }
+
+    public String getRoomBaseName() {
+        return roomBaseName;
+    }
+
+    public void setWxConfigId(String wxConfigId) {
+        this.wxConfigId = wxConfigId;
+    }
+
+    public String getWxConfigId() {
+        return wxConfigId;
+    }
+
+    public void setWxQrCode(String wxQrCode) {
+        this.wxQrCode = wxQrCode;
+    }
+
+    public String getWxQrCode() {
+        return wxQrCode;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    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 setChatCount(Integer chatCount) {
+        this.chatCount = chatCount;
+    }
+
+    public Integer getChatCount() {
+        return chatCount;
+    }
+
+    public List<Long> getChatIdList() {
+        return chatIdList;
+    }
+
+    public void setChatIdList(List<Long> chatIdList) {
+        this.chatIdList = chatIdList;
+    }
+
+    public void setLinkCount(Integer linkCount) {
+        this.linkCount = linkCount;
+    }
+
+    public Integer getLinkCount() {
+        return linkCount;
+    }
 }
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkChatDTO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @Modify
  * @CopyRight 
  */
-public class HmLinkChatDTO implements Serializable {
+public class HmLinkChatDTO extends HmLinkDTO implements Serializable {
 
     private static final long serialVersionUID = 45285331843100L;
 

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

@@ -12,7 +12,17 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private String wxEnterpriseId;
     private String enterpriseId;
     private String searchParams;
+    // 1进行中、2未开始、3已结束
     private Integer status;
+    private Long planId ;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
 
     public Date getStartDate() {
         return startDate;

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

@@ -19,6 +19,16 @@ public class GroupChatSearchQDTO implements Serializable {
     private Date dismissEndDate;
     // 群主列表
     private List<String> staffIdList;
+    // 群活码id
+    private Long chatHmId ;
+
+    public Long getChatHmId() {
+        return chatHmId;
+    }
+
+    public void setChatHmId(Long chatHmId) {
+        this.chatHmId = chatHmId;
+    }
 
     public Date getDismissStartDate() {
         return dismissStartDate;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmLinkChatQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.hm;
+
+import java.io.Serializable;
+
+public class HmLinkChatQDTO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 7581226892004325992L;
+    
+    private String wxEnterpriseId ;
+    private Long chatHmId;
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Long getChatHmId() {
+        return chatHmId;
+    }
+
+    public void setChatHmId(Long chatHmId) {
+        this.chatHmId = chatHmId;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
+import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 
 /**
@@ -24,5 +25,17 @@ public interface GroupChatHmApiService {
 
     // 保存/更新
     public ServiceResponse<GroupChatHmDTO> save(GroupChatHmDTO dto);
+    
+    /**
+     * 
+    * @Title: listChatLink
+    * @Description: 查询活码关联的链接
+    * @author xugh
+    * @param wxEnterpriseId
+    * @param chatHmId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Page<HmLinkChatDTO>> listPageChatLink(String wxEnterpriseId, Long chatHmId , BasePageInfo basePageInfo);
 
 }

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

@@ -4,6 +4,8 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 
 /**
@@ -35,4 +37,10 @@ public interface GroupChatPlanApiService {
     * @throws
      */
     public ServiceResponse<Void> doPlanTimer(String params);
+
+    public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo);
+
+    public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo);
 }

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

@@ -18,11 +18,11 @@ import com.gic.haoban.manage.service.entity.chat.TabGroupChatHm;
  */
 public interface GroupChatHmMapper {
 
-    public int insert(TabGroupChatHm tabHaobanGroupChatHm);
+    public int insert(TabGroupChatHm hm);
 
     public int deleteById(Long chatHmId);
 
-    public int updateByPrimaryKey(TabGroupChatHm tabHaobanGroupChatHm);
+    public int updateById(TabGroupChatHm hm);
 
     public TabGroupChatHm selectById(Long chatHmId);
 

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

+package com.gic.haoban.manage.service.dao.mapper.chat;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatHmRelation;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatHmRelationMapper
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年12月05日 17:33:14
+ * @Modify
+ * @CopyRight 
+ */
+public interface GroupChatHmRelationMapper {
+
+    public int insert(TabGroupChatHmRelation entity);
+
+    public int deleteById(@Param("chatHmId")Long chatHmId , @Param("groupChatId")Long groupChatId);
+
+    public int updateStatus(@Param("chatHmId")Long chatHmId , @Param("groupChatId")Long groupChatId , @Param("statusFlag")int statusFlag);
+
+    public List<TabGroupChatHmRelation> listByChatHmId(@Param("chatHmId")Long chatHmId);
+}
\ No newline at end of file

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

@@ -36,7 +36,7 @@ public interface GroupChatMapper {
 
     public TabGroupChat selectById(Long groupChatId);
 
-    public List<TabGroupChat> listByIdList(@Param("idList") List<String> idList);
+    public List<TabGroupChat> listByIdList(@Param("idList") List<Long> idList);
 
     public TabGroupChat selectByWxChatId(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("wxChatId") String wxChatId);

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper.chat;
 
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanLog;
 
 /**
@@ -17,5 +19,5 @@ public interface GroupChatPlanLogMapper {
 
     public int insert(TabGroupChatPlanLog entity);
 
-    public List<TabGroupChatPlanLog> listPlanLog(TabGroupChatPlanLog entity);
+    public List<GroupChatPlanLogDTO> listPlanLog(GroupChatPlanSearchQDTO qdto);
 }
\ No newline at end of file

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

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog;
 
 /**
@@ -22,8 +24,8 @@ public interface GroupChatPlanOwnerLogMapper {
 
     public TabGroupChatPlanOwnerLog selectById(Long ownerLogId);
 
-    public List<TabGroupChatPlanOwnerLog> listAll(TabGroupChatPlanOwnerLog entity);
-
     public void updateSendCount(@Param("id") Long id, @Param("sendCount") int sendCount,
             @Param("sendTime") Date sendTime);
+
+    public List<GroupChatPlanOwnerLogDTO> listPage(GroupChatPlanSearchQDTO qdto);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkChatMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
 import com.gic.haoban.manage.service.entity.hm.TabHmLinkChat;
 
 /**
@@ -26,4 +27,6 @@ public interface HmLinkChatMapper {
 
     public List<HmLinkChatDTO> listByLinkId(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("enterpriseId") String enterpriseId, @Param("linkId") Long linkId);
+    
+    public List<HmLinkChatDTO> listPage(HmLinkChatQDTO qdto) ;
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.entity.chat;
 
 import java.io.Serializable ;
+import java.util.Date;
 
 /**
  * 
@@ -53,8 +54,26 @@ public class TabGroupChat implements Serializable{
 	private Integer gicFlag;
 	private Integer initFlag ;
 	private String wxChatId3th;
+	private Date offTime ;
+	private String originalStaffId ;
 	
-	public String getWxChatId3th() {
+	public Date getOffTime() {
+        return offTime;
+    }
+
+    public String getOriginalStaffId() {
+        return originalStaffId;
+    }
+
+    public void setOffTime(Date offTime) {
+        this.offTime = offTime;
+    }
+
+    public void setOriginalStaffId(String originalStaffId) {
+        this.originalStaffId = originalStaffId;
+    }
+
+    public String getWxChatId3th() {
         return wxChatId3th;
     }
 

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

@@ -38,8 +38,6 @@ public class TabGroupChatHm implements Serializable{
 	private java.util.Date updateTime;
 	/**关联群数量*/
 	private Integer chatCount;
-	/**关联群id列表*/
-	private String chatIdList;
 	/**已关联链接数*/
 	private Integer linkCount;
 	
@@ -176,13 +174,6 @@ public class TabGroupChatHm implements Serializable{
 	public Integer getChatCount(){
 		return chatCount;
 	}
-	public void setChatIdList(String chatIdList){
-		this.chatIdList = chatIdList;
-	}
-	
-	public String getChatIdList(){
-		return chatIdList;
-	}
 	public void setLinkCount(Integer linkCount){
 		this.linkCount = linkCount;
 	}

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

+package com.gic.haoban.manage.service.entity.chat;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatHmRelation
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年12月05日 17:33:14
+ * @Modify
+ * @CopyRight 
+ */
+public class TabGroupChatHmRelation implements Serializable {
+
+    private static final long serialVersionUID = 348790533088000L;
+
+    private Long relationId;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private Long chatHmId;
+    private Long groupChatId;
+    private Integer deleteFlag;
+    private Integer statusFlag;
+    private java.util.Date createTime;
+    private java.util.Date updateTime;
+
+    public void setRelationId(Long relationId) {
+        this.relationId = relationId;
+    }
+
+    public Long getRelationId() {
+        return relationId;
+    }
+
+    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 setChatHmId(Long chatHmId) {
+        this.chatHmId = chatHmId;
+    }
+
+    public Long getChatHmId() {
+        return chatHmId;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public Long getGroupChatId() {
+        return groupChatId;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    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;
+    }
+}
\ No newline at end of file

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

@@ -38,8 +38,6 @@ public class GroupChatHmBO implements Serializable{
 	private java.util.Date updateTime;
 	/**关联群数量*/
 	private Integer chatCount;
-	/**关联群id列表*/
-	private String chatIdList;
 	/**已关联链接数*/
 	private Integer linkCount;
 	
@@ -176,13 +174,6 @@ public class GroupChatHmBO implements Serializable{
 	public Integer getChatCount(){
 		return chatCount;
 	}
-	public void setChatIdList(String chatIdList){
-		this.chatIdList = chatIdList;
-	}
-	
-	public String getChatIdList(){
-		return chatIdList;
-	}
 	public void setLinkCount(Integer linkCount){
 		this.linkCount = linkCount;
 	}

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

@@ -13,4 +13,6 @@ public interface GroupChatHmService {
     GroupChatHmBO getById(Long hmId);
 
     public Page<GroupChatHmBO> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo);
+    
+    
 }
\ No newline at end of file

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

@@ -2,7 +2,10 @@ package com.gic.haoban.manage.service.service.chat;
 
 import java.util.Date;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog;
 
 public interface GroupChatPlanOwnerLogService {
@@ -13,4 +16,7 @@ public interface GroupChatPlanOwnerLogService {
 
     TabGroupChatPlanOwnerLog getById(Long ownerLogId);
 
+    public Page<GroupChatPlanOwnerLogDTO> listPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo);
+
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ 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.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
 
@@ -18,4 +19,6 @@ public interface GroupChatPlanService {
     
     public void doPlanSendInfoTimer(String params) ;
 
+    public Page<GroupChatPlanLogDTO> listLogPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
+
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service.chat.impl;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,9 +23,11 @@ import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatHmMapper;
+import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatHmRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatMapper;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChat;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatHm;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatHmRelation;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatHmBO;
 import com.gic.haoban.manage.service.service.SecretSettingService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -50,6 +51,8 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     private GroupChatMapper groupChatMapper;
     @Autowired
     private GroupChatHmMapper groupChatHmMapper;
+    @Autowired
+    private GroupChatHmRelationMapper groupChatHmRelationMapper;
 
     @Override
     public Page<GroupChatHmBO> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -81,11 +84,17 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         if (null == secretSetting) {
             logger.info("没有配置代开应用");
         }
+        boolean updateFlag = false;
         Long hmid = UniqueIdUtils.uniqueLong();
+        if (null != dto.getChatHmId()) {
+            updateFlag = true;
+            hmid = dto.getChatHmId();
+        } else {
+            hmid = UniqueIdUtils.uniqueLong();
+        }
         dto.setChatHmId(hmid);
         dto.setChatHmCode("HM10" + hmid);
-        String[] arr = dto.getChatIdList().split(",");
-        List<String> chatidList = Arrays.asList(arr);
+        List<Long> chatidList = dto.getChatIdList() ;
         List<TabGroupChat> chatList = this.groupChatMapper.listByIdList(chatidList);
         List<String> wxChatidList = chatList.stream().map(item -> item.getWxChatId()).collect(Collectors.toList());
         logger.info("企微群id={}", wxChatidList);
@@ -104,19 +113,34 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         hm.setUpdateTime(new Date());
         hm.setChatCount(wxChatidList.size());
 
-        ServiceResponse<String> addResp = this.qywxChatApiService.addJoinWay(qwDTO.getDkCorpid(),
-                secretSetting.getSecretVal(), joinDTO);
-        logger.info("addResp={}", JSON.toJSONString(addResp));
-        String configId = addResp.getResult();
+        if (updateFlag) {
+            joinDTO.setConfig_id(hm.getWxConfigId());
+            ServiceResponse<Void> updateResp = this.qywxChatApiService.updateJoinWay(qwDTO.getDkCorpid(),
+                    secretSetting.getSecretVal(), joinDTO);
+            if (updateResp.isSuccess()) {
+                this.groupChatHmMapper.updateById(hm);
+            }
+        } else {
+            ServiceResponse<String> addResp = this.qywxChatApiService.addJoinWay(qwDTO.getDkCorpid(),
+                    secretSetting.getSecretVal(), joinDTO);
+            logger.info("addResp={}", JSON.toJSONString(addResp));
+            String configId = addResp.getResult();
 
-        ServiceResponse<AddJoinWayDTO> getResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(),
-                secretSetting.getSecretVal(), configId);
-        logger.info("getResp={}", JSON.toJSONString(getResp));
-        String qrCode = getResp.getResult().getQr_code();
-
-        hm.setWxConfigId(configId);
-        hm.setWxQrCode(qrCode);
-        this.groupChatHmMapper.insert(hm);
+            ServiceResponse<AddJoinWayDTO> getResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(),
+                    secretSetting.getSecretVal(), configId);
+            logger.info("getResp={}", JSON.toJSONString(getResp));
+            String qrCode = getResp.getResult().getQr_code();
+            hm.setWxConfigId(configId);
+            hm.setWxQrCode(qrCode);
+            this.groupChatHmMapper.insert(hm);
+            // 保存realtion
+            for(TabGroupChat item : chatList) {
+                TabGroupChatHmRelation entity = EntityUtil.changeEntity(TabGroupChatHmRelation.class, item) ;
+                entity.setChatHmId(hm.getChatHmId());
+                entity.setRelationId(UniqueIdUtils.uniqueLong());
+                this.groupChatHmRelationMapper.insert(entity) ;
+            }
+        }
     }
 
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service.chat.impl;
 
 import java.util.Date;
+import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanOwnerLogMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog;
 import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanOwnerLogService;
+import com.github.pagehelper.PageHelper;
 
 @Service("groupChatPlanOwnerLogService")
 public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogService {
@@ -42,6 +48,16 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
     }
     
     @Override
+    public Page<GroupChatPlanOwnerLogDTO> listPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        qdto.setPlanId(planId);
+        List<GroupChatPlanOwnerLogDTO> list = this.groupChatPlanOwnerLogMapper.listPage(qdto);
+        Page<GroupChatPlanOwnerLogDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatPlanOwnerLogDTO.class);
+        return retPage;
+    }
+    
+    @Override
     public void save(GroupChatPlanOwnerLogDTO dto) {
         TabGroupChatPlanOwnerLog log = EntityUtil.changeEntityByJSON(TabGroupChatPlanOwnerLog.class, dto);
         log.setOwnerLogId(UniqueIdUtils.uniqueLong());

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

@@ -22,6 +22,7 @@ import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.config.Config;
@@ -70,7 +71,12 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     @Override
     public void save(GroupChatPlanDTO dto) {
         TabGroupChatPlan entity = EntityUtil.changeEntityByJSON(TabGroupChatPlan.class, dto);
-        this.groupChatPlanMapper.insert(entity);
+        if (null == dto.getPlanId()) {
+            entity.setPlanId(UniqueIdUtils.uniqueLong());
+            this.groupChatPlanMapper.insert(entity);
+        } else {
+            this.groupChatPlanMapper.updateById(entity);
+        }
     }
 
     @Override
@@ -178,7 +184,14 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
 
             }
         }
-
+    }
+    
+    @Override
+    public Page<GroupChatPlanLogDTO> listLogPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<GroupChatPlanLogDTO> list = this.groupChatPlanLogMapper.listPlanLog(qdto);
+        Page<GroupChatPlanLogDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatPlanLogDTO.class);
+        return retPage;
     }
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkChatService.java

@@ -2,7 +2,10 @@ package com.gic.haoban.manage.service.service.hm;
 
 import java.util.List;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
 
 /**
  * 
@@ -17,4 +20,7 @@ public interface HmLinkChatService {
     public List<HmLinkChatDTO> listByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId);
 
     public int save(Long linkId, List<HmLinkChatDTO> list);
+
+    public Page<HmLinkChatDTO> listPage(HmLinkChatQDTO qdto, BasePageInfo basePageInfo);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkChatServiceImpl.java

@@ -7,12 +7,17 @@ import org.apache.commons.collections.CollectionUtils;
 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.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkChatMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHmLinkChat;
 import com.gic.haoban.manage.service.service.hm.HmLinkChatService;
+import com.github.pagehelper.PageHelper;
 
 @Service("hmLinkChatService")
 public class HmLinkChatServiceImpl implements HmLinkChatService {
@@ -50,4 +55,12 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
         return 0;
     }
 
+    @Override
+    public Page<HmLinkChatDTO> listPage(HmLinkChatQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<HmLinkChatDTO> list = this.hmLinkChatMapper.listPage(qdto);
+        Page<HmLinkChatDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, HmLinkChatDTO.class);
+        return retPage;
+    }
+
 }

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

@@ -9,10 +9,13 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
+import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatHmApiService;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatHmBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatHmService;
+import com.gic.haoban.manage.service.service.hm.HmLinkChatService;
 
 /**
  * 
@@ -27,6 +30,8 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
 
     @Autowired
     private GroupChatHmService groupChatHmService;
+    @Autowired
+    private HmLinkChatService hmLinkChatService;
 
     @Override
     public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -48,4 +53,14 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
         return ServiceResponse.success(dto);
     }
 
+    @Override
+    public ServiceResponse<Page<HmLinkChatDTO>> listPageChatLink(String wxEnterpriseId, Long chatHmId,
+            BasePageInfo basePageInfo) {
+        HmLinkChatQDTO qdto = new HmLinkChatQDTO();
+        qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setChatHmId(chatHmId);
+        Page<HmLinkChatDTO> page = this.hmLinkChatService.listPage(qdto, basePageInfo);
+        return ServiceResponse.success(page);
+    }
+
 }

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

@@ -9,9 +9,12 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
+import com.gic.haoban.manage.service.service.chat.GroupChatPlanOwnerLogService;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
 
 @Service("groupChatPlanApiService")
@@ -19,6 +22,8 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
 
     @Autowired
     private GroupChatPlanService groupChatPlanService;
+    @Autowired
+    private GroupChatPlanOwnerLogService groupChatPlanOwnerLogService;
 
     @Override
     public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -39,7 +44,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         this.groupChatPlanService.save(dto);
         return ServiceResponse.success(dto);
     }
-    
+
     /**
      * 
     * @Title: doPlan
@@ -51,9 +56,23 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
      */
     @Override
     public ServiceResponse<Void> doPlanTimer(String params) {
-        Long planId = Long.parseLong(params) ;
-        this.groupChatPlanService.doPlan(planId) ;
+        Long planId = Long.parseLong(params);
+        this.groupChatPlanService.doPlan(planId);
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo) {
+        Page<GroupChatPlanLogDTO> page = this.groupChatPlanService.listLogPage(qdto, basePageInfo);
+        return ServiceResponse.success(page);
+    }
+
+    @Override
+    public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo) {
+        Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo);
+        return ServiceResponse.success(page);
+    }
+
 }

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

@@ -23,7 +23,6 @@
 		<result column="create_time" property="createTime" />
 		<result column="update_time" property="updateTime" />
 		<result column="chat_count" property="chatCount" />
-		<result column="chat_id_list" property="chatIdList" />
 		<result column="link_count" property="linkCount" />
 	</resultMap>
 	<sql id="Base_Column_List">
@@ -46,7 +45,6 @@
 		create_time,
 		update_time,
 		chat_count,
-		chat_id_list,
 		link_count
 	</sql>
 	<!-- ===================== 新增 ======================== -->
@@ -73,30 +71,28 @@
 	  create_time,
 	  update_time,
 	  chat_count,
-	  chat_id_list,
 	  link_count
   )VALUES(
 	  #{chatHmId,jdbcType=BIGINT},
-	  #{chatHmCode,jdbcType=VARCHAR},
+	  #{chatHmCode},
 	  #{wxEnterpriseId,jdbcType=CHAR},
 	  #{enterpriseId,jdbcType=CHAR},
-	  #{name,jdbcType=VARCHAR},
-	  #{remark,jdbcType=VARCHAR},
-	  #{autoCreateRoom,jdbcType=INTEGER},
-	  #{roomBaseId,jdbcType=INTEGER},
-	  #{roomBaseName,jdbcType=VARCHAR},
-	  #{wxConfigId,jdbcType=VARCHAR},
-	  #{wxQrCode,jdbcType=VARCHAR},
-	  #{creatorId,jdbcType=VARCHAR},
-	  #{creatorName,jdbcType=VARCHAR},
-	  #{modifierId,jdbcType=VARCHAR},
-	  #{modifierName,jdbcType=VARCHAR},
-	  #{deleteFlag,jdbcType=INTEGER},
+	  #{name},
+	  #{remark},
+	  #{autoCreateRoom},
+	  #{roomBaseId},
+	  #{roomBaseName},
+	  #{wxConfigId},
+	  #{wxQrCode},
+	  #{creatorId},
+	  #{creatorName},
+	  #{modifierId},
+	  #{modifierName},
+	  #{deleteFlag},
 	  #{createTime,jdbcType=TIMESTAMP},
 	  #{updateTime,jdbcType=TIMESTAMP},
-	  #{chatCount,jdbcType=INTEGER},
-	  #{chatIdList,jdbcType=VARCHAR},
-	  #{linkCount,jdbcType=INTEGER}
+	  #{chatCount},
+	  0
   )
   ]]>
 	</insert>
@@ -108,31 +104,19 @@
 
 
 	<!-- ==================更新 ========== -->
-	<update id="updateByPrimaryKey"
+	<update id="updateById"
 		parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatHm">
   <![CDATA[
   UPDATE tab_haoban_group_chat_hm SET
-	  chat_hm_id=#{chatHmId,jdbcType=BIGINT},
-	  chat_hm_code=#{chatHmCode,jdbcType=VARCHAR},
-	  wx_enterprise_id=#{wxEnterpriseId,jdbcType=CHAR},
-	  enterprise_id=#{enterpriseId,jdbcType=CHAR},
-	  name=#{name,jdbcType=VARCHAR},
-	  remark=#{remark,jdbcType=VARCHAR},
-	  auto_create_room=#{autoCreateRoom,jdbcType=INTEGER},
-	  room_base_id=#{roomBaseId,jdbcType=INTEGER},
-	  room_base_name=#{roomBaseName,jdbcType=VARCHAR},
-	  wx_config_id=#{wxConfigId,jdbcType=VARCHAR},
-	  wx_qr_code=#{wxQrCode,jdbcType=VARCHAR},
-	  creator_id=#{creatorId,jdbcType=VARCHAR},
-	  creator_name=#{creatorName,jdbcType=VARCHAR},
-	  modifier_id=#{modifierId,jdbcType=VARCHAR},
-	  modifier_name=#{modifierName,jdbcType=VARCHAR},
-	  delete_flag=#{deleteFlag,jdbcType=INTEGER},
-	  create_time=#{createTime,jdbcType=TIMESTAMP},
-	  update_time=#{updateTime,jdbcType=TIMESTAMP},
-	  chat_count=#{chatCount,jdbcType=INTEGER},
-	  chat_id_list=#{chatIdList,jdbcType=VARCHAR},
-	  link_count=#{linkCount,jdbcType=INTEGER}
+	  name=#{name},
+	  remark=#{remark},
+	  auto_create_room=#{autoCreateRoom},
+	  room_base_id=#{roomBaseId},
+	  room_base_name=#{roomBaseName},
+	  modifier_id=#{modifierId},
+	  modifier_name=#{modifierName},
+	  update_time=now(),
+	  chat_count=#{chatCount}
   where chat_hm_id = #{chatHmId}
   ]]>
 	</update>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper
+	namespace="com.gic.haoban.manage.service.dao.mapper.chat.GroupChatHmRelationMapper">
+	<resultMap
+		type="com.gic.haoban.manage.service.entity.chat.TabGroupChatHmRelation"
+		id="result-map-tabHaobanGroupChatHmRelation">
+		<result column="relation_id" property="relationId" />
+		<result column="wx_enterprise_id" property="wxEnterpriseId" />
+		<result column="enterprise_id" property="enterpriseId" />
+		<result column="chat_hm_id" property="chatHmId" />
+		<result column="group_chat_id" property="groupChatId" />
+		<result column="delete_flag" property="deleteFlag" />
+		<result column="status_flag" property="statusFlag" />
+		<result column="create_time" property="createTime" />
+		<result column="update_time" property="updateTime" />
+	</resultMap>
+	<sql id="Base_Column_List">
+		relation_id,
+		wx_enterprise_id,
+		enterprise_id,
+		chat_hm_id,
+		group_chat_id,
+		delete_flag,
+		status_flag,
+		create_time,
+		update_time
+	</sql>
+	<!-- ===================== 新增 ======================== -->
+	<insert id="insert"
+		parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatHmRelation">
+  <![CDATA[
+  INSERT INTO tab_haoban_group_chat_hm_relation(
+	  relation_id,
+	  wx_enterprise_id,
+	  enterprise_id,
+	  chat_hm_id,
+	  group_chat_id,
+	  delete_flag,
+	  status_flag,
+	  create_time,
+	  update_time
+  )VALUES(
+	  #{relationId},
+	  #{wxEnterpriseId},
+	  #{enterpriseId},
+	  #{chatHmId},
+	  #{groupChatId},
+	  0,
+	  1,
+	  now(),
+	  now()
+  )
+  ]]>
+	</insert>
+
+	<!-- =====================删除==================== -->
+	<delete id="deleteById">
+		UPDATE tab_haoban_group_chat_hm_relation SET delete_flag = 1 WHERE
+		 where chat_hm_id = #{chatHmId} and  group_chat_id= #{groupChatId}
+	</delete>
+
+
+	<!-- ==================更新 ========== -->
+	<update id="updateStatus">
+	  <![CDATA[
+	  UPDATE tab_haoban_group_chat_hm_relation SET
+		  status_flag=#{statusFlag},
+		  update_time=now()
+	  where chat_hm_id = #{chatHmId} and  group_chat_id= #{groupChatId}
+	  ]]>
+	</update>
+
+	<select id="listByChatHmId" resultMap="result-map-tabHaobanGroupChatHmRelation">
+		select
+		<include refid="Base_Column_List" />
+		from tab_haoban_group_chat_hm_relation  where chat_hm_id = #{chatHmId} and delete_flag = 0
+	</select>
+</mapper> 
\ No newline at end of file

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

@@ -25,6 +25,8 @@
 		<result column="gic_flag" property="gicFlag" />
 		<result column="init_flag" property="initFlag" />
 		<result column="wx_chat_id_3th" property="wxChatId3th" />
+		<result column="off_time" property="offTime"/>
+		<result column="original_staff_id" property="originalStaffId"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		group_chat_id,
@@ -46,7 +48,7 @@
 		quit_count,
 		quit_member_count,
 		enterprise_id,
-		gic_flag , init_flag , wx_chat_id_3th
+		gic_flag , init_flag , wx_chat_id_3th , off_time, original_staff_id
 	</sql>
 	<!-- ===================== 新增 ======================== -->
 	<insert id="insert"
@@ -72,7 +74,7 @@
 	  quit_count,
 	  quit_member_count,
 	  enterprise_id,
-	  gic_flag , init_flag
+	  gic_flag , init_flag , original_staff_id ,
   )VALUES(
 	  #{groupChatId},
 	  #{wxEnterpriseId},
@@ -93,7 +95,7 @@
 	  #{quitCount},
 	  #{quitMemberCount},
 	  #{enterpriseId},
-	  #{gicFlag} , #{initFlag}
+	  #{gicFlag} , #{initFlag} , #{originalStaffId}
   )
   ]]>
 	</insert>

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

@@ -64,7 +64,7 @@
   ]]>
   </insert>
   
-  <select id="listPlanLog"  parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanLog" resultMap="result-map-tabHaobanGroupChatPlanLog">
+  <select id="listPlanLog"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO">
   	 select <include refid="Base_Column_List" /> from tab_haoban_group_chat_plan_log 
   </select>
 </mapper> 
\ No newline at end of file

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

@@ -82,7 +82,7 @@
   SELECT <include refid="Base_Column_List"/> FROM tab_haoban_group_chat_plan_owner_log WHERE owner_log_id = #{ownerLogId} and delete_flag = 0
   </select>
   
-  <select id="listAll"  parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">
+  <select id="listPage"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
   	 select * from tab_haoban_group_chat_plan_owner_log 
   </select>
 </mapper> 
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkChatMapper.xml

@@ -93,4 +93,15 @@
 		member_type memberType 
 		from  tab_haoban_hm_link_chat where link_id = #{linkId} and wx_enterprise_id = #{wxEnterpriseId}  and enterprise_id = #{enterpriseId}
 	</select>
+	
+	
+	<select id="listPage" parameterType="com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO" resultType="com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO">
+		SELECT  a.link_id , b.`name` , b.`link_code` , b.`short_code`  FROM tab_haoban_hm_link_chat a LEFT JOIN tab_haoban_hm_link b ON a.link_id = b.link_id 
+		WHERE  a.wx_enterprise_id=#{wxEnterpriseId}
+		<if test="null != chatHmId">
+			and a.chat_hm_id = #{chatHmId}
+		</if>
+		GROUP BY a.`link_id`
+	</select>
+	
 </mapper> 
\ No newline at end of file

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

@@ -11,8 +11,12 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 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.hm.HmLinkChatDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatHmApiService;
 
 /**
@@ -29,6 +33,8 @@ public class GroupChatHmController {
 
     @Autowired
     private GroupChatHmApiService groupChatHmApiService;
+    @Autowired
+    private GroupChatApiService groupChatApiService;
 
     @RequestMapping("add")
     public RestResponse<Object> save(@RequestBody GroupChatHmDTO dto) {
@@ -71,4 +77,24 @@ public class GroupChatHmController {
         return RestResponse.successResult(hm);
     }
 
+    
+    @RequestMapping("link-relation")
+    public RestResponse<Object> linkRelation(Long chatHmId , BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
+        ServiceResponse<Page<HmLinkChatDTO>> page = this.groupChatHmApiService.listPageChatLink(wxEnterpriseId, chatHmId, basePageInfo);
+        return RestResponse.successResult(page.getResult());
+    }
+    
+    @RequestMapping("group-relation")
+    public RestResponse<Object> groupRelation(Long chatHmId , BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
+        GroupChatSearchQDTO qdto = new GroupChatSearchQDTO() ;
+        qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setChatHmId(chatHmId);
+        ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
+        return RestResponse.successResult(page.getResult());
+    }
+    
 }

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

@@ -12,6 +12,8 @@ import com.gic.commons.webapi.reponse.RestResponse;
 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.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 
@@ -71,4 +73,24 @@ public class GroupChatPlanController {
         return RestResponse.successResult(hm);
     }
 
+    @RequestMapping("owner-log")
+    public RestResponse<Object> ownerLog(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> resp = this.groupChatPlanApiService.listOwnerLogPage(planId,
+                qdto, basePageInfo);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("1", "计划不存在");
+        }
+        return RestResponse.successResult(resp.getResult());
+    }
+
+    @RequestMapping("log")
+    public RestResponse<Object> log(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        ServiceResponse<Page<GroupChatPlanLogDTO>> resp = this.groupChatPlanApiService.listLogPage(planId, qdto,
+                basePageInfo);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("1", "计划不存在");
+        }
+        return RestResponse.successResult(resp.getResult());
+    }
+
 }