群发终止

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

@@ -5,16 +5,47 @@ import java.util.Date;
 
 public class GroupChatPlanSearchQDTO implements Serializable {
 
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -4052311727115335624L;
     private String wxEnterpriseId;
     private String enterpriseId;
     private String searchParams;
     // 1进行中、2未开始、3已结束
     private Integer status;
+    // 群主 1待发送 2已发送
+    private Integer sendStatus ; 
+    // 群名称
+    private String chatName ;
     private Long planId;
     private Date startDate;
     private Date endDate;
+    private String clerkId ;
+    
+    public String getChatName() {
+        return chatName;
+    }
+
+    public void setChatName(String chatName) {
+        this.chatName = chatName;
+    }
 
-    private Date testDate;
+    public Integer getSendStatus() {
+        return sendStatus;
+    }
+
+    public void setSendStatus(Integer sendStatus) {
+        this.sendStatus = sendStatus;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
 
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
@@ -44,10 +75,6 @@ public class GroupChatPlanSearchQDTO implements Serializable {
         return endDate;
     }
 
-    public Date getTestDate() {
-        return testDate;
-    }
-
     public void setWxEnterpriseId(String wxEnterpriseId) {
         this.wxEnterpriseId = wxEnterpriseId;
     }
@@ -76,7 +103,4 @@ public class GroupChatPlanSearchQDTO implements Serializable {
         this.endDate = endDate;
     }
 
-    public void setTestDate(Date testDate) {
-        this.testDate = testDate;
-    }
 }

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

@@ -45,4 +45,6 @@ public interface GroupChatPlanApiService {
             BasePageInfo basePageInfo);
 
     public ServiceResponse<Void> del(String clerkId, String clerkName, Long planId);
+    
+    public ServiceResponse<Void> stop(String clerkId, String clerkName, Long planId) ;
 }

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

@@ -22,6 +22,9 @@ public interface GroupChatPlanMapper {
 
     public int deleteById(@Param("planId") Long planId, @Param("clerkId") String clerkId,
             @Param("clerkName") String clerkName);
+    
+    public int stopById(@Param("planId") Long planId, @Param("clerkId") String clerkId,
+            @Param("clerkName") String clerkName);
 
     public int updateSendFlag(@Param("planId") Long planId);
 

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

@@ -22,5 +22,7 @@ public interface GroupChatPlanService {
     public Page<GroupChatPlanLogDTO> listLogPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
 
     public void del(String clerkId, String clerkName, Long planId);
+    
+    public void stop(String clerkId, String clerkName, Long planId) ;
 
 }
\ No newline at end of file

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

@@ -250,6 +250,11 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         this.groupChatPlanMapper.deleteById(planId, clerkId, clerkName);
         this.addOrDelTimer(planId, new Date(), 0);
     }
+    
+    @Override
+    public void stop(String clerkId, String clerkName, Long planId) {
+        this.groupChatPlanMapper.stopById(planId, clerkId, clerkName);
+    }
 
     @Override
     public Page<GroupChatPlanLogDTO> listLogPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {

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

@@ -80,5 +80,11 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         this.groupChatPlanService.del(clerkId, clerkName, planId);
         return ServiceResponse.success();
     }
+    
+    @Override
+    public ServiceResponse<Void> stop(String clerkId, String clerkName, Long planId) {
+        this.groupChatPlanService.stop(clerkId, clerkName, planId);
+        return ServiceResponse.success();
+    }
 
 }

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

@@ -109,7 +109,13 @@
 	<update id="deleteById" parameterType="long">
 		UPDATE
 		tab_haoban_group_chat_plan SET delete_flag = 1 , modifier_id =
-		#{clerkId} , modifier_name = #{clerkName} WHERE plan_id = #{planId}
+		#{clerkId} , modifier_name = #{clerkName} , update_time=now()  WHERE plan_id = #{planId}
+	</update>
+	
+	<update id="stopById" parameterType="long">
+		UPDATE
+		tab_haoban_group_chat_plan SET status_flag = 0 , modifier_id =
+		#{clerkId} , modifier_name = #{clerkName} , send_time = now() , update_time=now()  WHERE plan_id = #{planId}
 	</update>
 	
 	<update id="updateSendFlag">