群群发查询回退

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

@@ -171,15 +171,13 @@
   	  		and b.name like #{searchParams}
   	  	</if>
 	  <if test="1==clerkTaskStatus">
-		  group by b.plan_id
-		  having ( notSendCount > 0  AND  b.`end_time` <![CDATA[>=]]>  NOW() )
-		  order by b.end_time desc ,  a.create_time desc
+		  and b.end_time > now()
 	  </if>
 	  <if test="2==clerkTaskStatus">
-		  group by b.plan_id
-		  having ( notSendCount = 0  or (sendCount > 0 and  b.`end_time` <![CDATA[<]]>  NOW() ) )
-		  order by b.end_time desc ,  a.create_time desc
+		  and b.end_time <![CDATA[<=]]> now()
 	  </if>
+	  group by b.plan_id
+	  order by b.end_time desc ,  a.create_time desc
   </select>
   
   <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">