test

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

@@ -5,35 +5,16 @@ import java.util.Date;
 
 public class GroupChatPlanSearchQDTO implements Serializable {
 
-    /**
-    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
-    */
-    private static final long serialVersionUID = -3525126585626137501L;
-    private Date startDate;
-    private Date endDate;
-    
     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;
-    }
+    private Long planId;
+    private Date startDate;
+    private Date endDate;
 
-    public Date getEndDate() {
-        return endDate;
-    }
+    private Date testDate;
 
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
@@ -51,12 +32,20 @@ public class GroupChatPlanSearchQDTO implements Serializable {
         return status;
     }
 
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
+    public Long getPlanId() {
+        return planId;
     }
 
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public Date getTestDate() {
+        return testDate;
     }
 
     public void setWxEnterpriseId(String wxEnterpriseId) {
@@ -74,4 +63,20 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public void setTestDate(Date testDate) {
+        this.testDate = testDate;
+    }
 }

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

@@ -2,7 +2,6 @@ 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 {
 

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

@@ -29,6 +29,18 @@ public interface GroupChatHmApiService {
 
     /**
      * 
+    * @Title: discard
+    * @Description: 废弃
+    * @author xugh
+    * @param chatHmId
+    * @param wxEnterpriseId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Void> discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName);
+
+    /**
+     * 
     * @Title: listChatLink
     * @Description: 查询活码关联的链接
     * @author xugh

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper.chat;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatHm;
 
@@ -22,6 +24,9 @@ public interface GroupChatHmMapper {
 
     public int updateById(TabGroupChatHm hm);
 
+    public int discard(@Param("chatHmId") Long chatHmId, @Param("wxEnterpriseId") String wxEnterpriseId,
+            @Param("clerkId") String clerkId, @Param("clerkName") String clerkName);
+
     public TabGroupChatHm selectById(Long chatHmId);
 
     public List<TabGroupChatHm> list(ChatHmSearchQDTO qdto);

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

@@ -24,4 +24,6 @@ public interface GroupChatHmService {
      */
     public void handleChatOff(Long groupChat);
 
+    public void discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName);
+
 }
\ No newline at end of file

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

@@ -89,7 +89,13 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         GroupChatHmBO bo = EntityUtil.changeEntityByJSON(GroupChatHmBO.class, hm);
         return bo;
     }
-
+    
+    
+    @Override
+    public void discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName) { 
+        this.groupChatHmMapper.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
+    }
+    
     @Override
     public void handleChatOff(Long groupChatId) {
         List<Long> hmIdList = this.groupChatHmRelationMapper.listChatHmId(groupChatId);

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

@@ -52,7 +52,13 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
         this.groupChatHmService.saveHm(dto);
         return ServiceResponse.success(dto);
     }
-
+    
+    @Override
+    public ServiceResponse<Void> discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName) {
+        this.groupChatHmService.discard(chatHmId,wxEnterpriseId,clerkId,clerkName) ;
+        return ServiceResponse.success();
+    }
+    
     @Override
     public ServiceResponse<Page<HmLinkChatDTO>> listPageChatLink(HmLinkChatQDTO qdto,
             BasePageInfo basePageInfo) {

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

@@ -123,6 +123,11 @@
   where chat_hm_id = #{chatHmId}
   ]]>
 	</update>
+	
+	
+	<update id="discard">
+		update tab_haoban_group_chat_hm set status_flag = 2 , update_time = now() , modifier_id=#{clerkId} , modifier_name=#{clerkName} where chat_hm_id = #{chatHmId} and wx_enterprise_id = #{wxEnterpriseId}
+	</update>
 
 	<!-- ============ 查询============= -->
 	<select id="selectById" parameterType="long"

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

@@ -85,6 +85,15 @@ public class GroupChatHmController {
         return RestResponse.successResult(hm);
     }
 
+    public RestResponse<Object> discard(Long chatHmId) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String clerkId = loginUser.getClerkId();
+        String clerkName = loginUser.getClerkName();
+        this.groupChatHmApiService.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
+        return RestResponse.successResult();
+    }
+
     /**
      * 
     * @Title: linkRelation