时间段冲突规则不对

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -73,7 +73,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
                     return resp;
                     return resp;
                 }
                 }
             } else {
             } else {
-                resp.setCommonResult(new CommonResult(true, "taskTimeFrom,taskTimeEnd不能为空"));
+                resp.setCommonResult(new CommonResult(false, "taskTimeFrom,taskTimeEnd不能为空"));
                 return resp;
                 return resp;
             }
             }
 
 

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

@@ -84,8 +84,10 @@
         FROM ag_mkt_schedule_task_tracking
         FROM ag_mkt_schedule_task_tracking
         WHERE practitioner_id = #{practitionerId,jdbcType=BIGINT}
         WHERE practitioner_id = #{practitionerId,jdbcType=BIGINT}
             AND to_days(created_at) = to_days(now())
             AND to_days(created_at) = to_days(now())
-            AND task_time_from < STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s')
-            AND task_time_end > STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s')
+            AND
+               (task_time_from > STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_from < STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
+            OR (task_time_from < STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_end > STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
+            OR (task_time_end > STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_end < STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
     </select>
     </select>
 
 
     <select id="querySaleRecuitScoreFYC" resultType="com.yd.dal.entity.practitioner.PersonalPEPScore">
     <select id="querySaleRecuitScoreFYC" resultType="com.yd.dal.entity.practitioner.PersonalPEPScore">