社群群发

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

@@ -40,6 +40,15 @@ public class GroupChatPlanOwnerLogDTO implements Serializable{
 	private Date expireDate ;
 	private Date sendTime ;
 	private int execType ;
+	private Date dataGetTime ;
+
+	public Date getDataGetTime() {
+		return dataGetTime;
+	}
+
+	public void setDataGetTime(Date dataGetTime) {
+		this.dataGetTime = dataGetTime;
+	}
 
 	public int getExecType() {
 		return execType;

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

@@ -15,7 +15,7 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private String searchParams;
     // 1进行中、2未开始、3已结束
     private Integer status;
-    // 群主 0发送失败 1待发送 2已发送
+    // 群主 0发送失败 1待发送 2已发送 3放弃 30(失败+放弃)
     private Integer sendStatus ; 
     // 群名称
     private String chatName ;

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

@@ -35,6 +35,15 @@ public class TabGroupChatPlanOwnerLog implements Serializable {
     private Integer deleteFlag;
     private Date sendTime;
     private int execType ;
+    private Date dataGetTime ;
+
+    public Date getDataGetTime() {
+        return dataGetTime;
+    }
+
+    public void setDataGetTime(Date dataGetTime) {
+        this.dataGetTime = dataGetTime;
+    }
 
     public int getExecType() {
         return execType;

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

@@ -19,6 +19,8 @@
       <result column="done_flag" property="doneFlag"/>
       <result column="send_time" property="sendTime"/>
       <result column="fail_count" property="failCount"/>
+	  <result column="exec_type" property="execType" />
+	  <result column="data_get_time" property="dataGetTime" />
   </resultMap>
   <sql id="Base_Column_List">
 	  owner_log_id,
@@ -31,7 +33,7 @@
 	  send_status,
 	  send_count,
 	  create_time,
-	  update_time , remark , msgid , delete_flag , done_flag , send_time ,  fail_count , exec_type
+	  update_time , remark , msgid , delete_flag , done_flag , send_time ,  fail_count , exec_type , data_get_time
   </sql>
   <!-- ===================== 新增 ======================== -->
   
@@ -92,7 +94,7 @@
   <update id="updateSendCount">
   	<![CDATA[
   		UPDATE tab_haoban_group_chat_plan_owner_log SET send_count = #{sendCount} ,  fail_count =#{failCount} , done_flag = 1 , 
-  		send_status = 2 , send_time = #{sendTime} , 
+  		send_status = 2 , send_time = #{sendTime} , data_get_time = now() ,
   		update_time = now() where owner_log_id = #{id}
   	]]>
   </update>
@@ -108,7 +110,7 @@
 		update tab_haoban_group_chat_plan_owner_log set send_status = 3 where owner_log_id = #{id}
 	</update>
 	<update id="staffSendResult">
-		update tab_haoban_group_chat_plan_owner_log set send_status = 2 , send_time = #{sendTime} where plan_id = #{planId} and staff_id = #{staffId}
+		update tab_haoban_group_chat_plan_owner_log set send_status = 2 , send_time = #{sendTime}  where plan_id = #{planId} and staff_id = #{staffId}
 	</update>
 
 	<!-- ============ 查询=============-->

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

@@ -196,6 +196,7 @@ public class GroupChatPlanController {
             ownerInfo.put("clerkName", owner.getClerkName());
             ownerInfo.put("ownerLogId", owner.getOwnerLogId());
             ownerInfo.put("sendStatus", owner.getSendStatus());
+            ownerInfo.put("dataGetTime",owner.getDataGetTime());
             retMap.put("ownerInfo", ownerInfo);
         }
         return RestResponse.successResult(retMap);