活动时间6

yd-api/src/main/resources/mapper/marketing/ScheduleTrackMapper.xml

@@ -82,11 +82,12 @@
     <select id="checkTimePeriodConflict" resultType="int">
     <select id="checkTimePeriodConflict" resultType="int">
         SELECT count(1)
         SELECT count(1)
         FROM ag_mkt_schedule_task_tracking
         FROM ag_mkt_schedule_task_tracking
-        WHERE
-            task_time_from &lt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s')
-	        AND task_time_end &lt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s')
+        WHERE 1=1
             AND to_days(track_time) = to_days(now())
             AND to_days(track_time) = to_days(now())
             AND practitioner_id = #{practitionerId,jdbcType=BIGINT}
             AND practitioner_id = #{practitionerId,jdbcType=BIGINT}
+            AND task_time_from &gt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s')
+	         OR task_time_end &lt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s')
+
     </select>
     </select>
 
 
     <resultMap id="PersonalPEPScore" type="com.yd.dal.entity.practitioner.PersonalPEPScore">
     <resultMap id="PersonalPEPScore" type="com.yd.dal.entity.practitioner.PersonalPEPScore">