社群群发

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

@@ -38,6 +38,17 @@ public class GroupChatSearchQDTO extends PageQo implements Serializable {
     private String wxChatId ;
     private String searchPage ;
 
+    // 查询放弃群的过滤时间
+    private Date giveUpStartTime ;
+
+    public Date getGiveUpStartTime() {
+        return giveUpStartTime;
+    }
+
+    public void setGiveUpStartTime(Date giveUpStartTime) {
+        this.giveUpStartTime = giveUpStartTime;
+    }
+
     public String getSearchPage() {
         return searchPage;
     }

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

@@ -533,9 +533,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         List<TabGroupChatPlanLog> addList = new ArrayList<>();
         boolean endFlag = false;
         List<Long> doneGroupChatIdList = new ArrayList<>() ;
+        Date sendTime = null ;
         for (QywxSendMessageResultDTO item : list) {
             TabGroupChatPlanLog entity = new TabGroupChatPlanLog();
-            Date sendTime = item.getSendTime();
+            sendTime = item.getSendTime();
             String wxChatId = item.getChatId();
             // 如果企微的发送时间晚于计划的结束时间,不记录此类数据
             if (sendTime.after(plan.getEndTime())) {
@@ -581,6 +582,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         chatQDTO.setStaffId(staffId);
         chatQDTO.setStatus(0);
         chatQDTO.setGicFlag(1);
+        chatQDTO.setGiveUpStartTime(sendTime);
         List<GroupChatDTO> groupChatDTOList = this.groupChatMapper.list(chatQDTO);
         if(CollectionUtils.isNotEmpty(groupChatDTOList)) {
             for(GroupChatDTO chatDTO : groupChatDTOList) {

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

@@ -316,6 +316,11 @@
 		<if test="null != startDate">
 			and a.chat_add_time <![CDATA[ >=]]>   #{startDate} and a.chat_add_time  <![CDATA[ <= ]]>  #{endDate}
 		</if>
+
+		<if test="null != giveUpStartTime">
+			and a.chat_add_time  <![CDATA[ <= ]]>  #{giveUpStartTime}
+		</if>
+
 		<if test="null != dismissStartDate">
 			and a.chat_dissolve_time <![CDATA[ >=]]>   #{startDate} and a.chat_dissolve_time  <![CDATA[ <= ]]>  #{endDate}	
 		</if>