社群群发

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

@@ -96,8 +96,14 @@
   	  	 and (d.name like #{chatName} or d.wx_chat_id like #{wxChatId}
   	  </if>
   	  <if test="null !=sendStatus">
+  	  	<if test="sendStatus==30">
+			and a.send_status = in (0,3)
+		</if>
+		<if test="sendStatus != 30">
 		   and a.send_status = #{sendStatus}
 		</if>
+  	  </if>
+
   	  <if test="null != startDate">
 			and a.create_time <![CDATA[>=]]>	#{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
 	  </if>

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

@@ -213,7 +213,7 @@ public class GroupChatPlanController {
      */
     @RequestMapping("owner-do-list")
     public RestResponse<Page<GroupChatPlanLogDTO>> ownerDoList(Long planId, String wxEnterpriseId, String enterpriseId, Long ownLogId,
-            BasePageInfo basePageInfo) {
+            BasePageInfo basePageInfo,Integer sendStatus) {
         if (null == planId || null == ownLogId) {
             return RestResponse.failure("1", "参数未传");
         }
@@ -222,6 +222,10 @@ public class GroupChatPlanController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setPlanId(planId);
         qdto.setOwnLogId(ownLogId);
+        if(null == sendStatus) {
+            sendStatus = 2 ;
+        }
+        qdto.setSendStatus(sendStatus);
         ServiceResponse<Page<GroupChatPlanLogDTO>> page = this.groupChatPlanApiService.listLogPage(planId, qdto,
                 basePageInfo);
         return RestResponse.successResult(page.getResult());