From 56244691ad31889badf7c22fcce84aecc20fe403 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Wed, 10 Apr 2024 10:47:55 +0800
Subject: [PATCH] fix

---
 .../src/main/resources/mapper/LineCalendarsEventMapper.xml     | 2 +-
 .../java/com/cool/store/vo/interview/AppointmentTimeVO.java    | 3 +++
 .../com/cool/store/service/impl/LineInterviewServiceImpl.java  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
index 2898a9631..89cdcc1b9 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
@@ -22,7 +22,7 @@
   </select>
 
   <select id="getRegionLineCalendarsEvent" resultMap="BaseResultMap">
-    select start_time, end_time from xfsg_line_calendars_event where interview_date = #{interviewDate} and region_id = #{regionId} and interview_type = '1'
+    select start_time, end_time from xfsg_line_calendars_event where interview_date = #{interviewDate} and region_id = #{regionId} and interview_type != '0' and start_time > now()
   </select>
   
   <select id="getOccupiedCount" resultType="integer">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/AppointmentTimeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/AppointmentTimeVO.java
index 42eda5a70..29c63f47b 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/AppointmentTimeVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/AppointmentTimeVO.java
@@ -88,6 +88,9 @@ public class AppointmentTimeVO {
     }
 
     public static boolean isOverlapping(LocalDateTime start1, LocalDateTime end1, LocalDateTime start2, LocalDateTime end2) {
+        if(start1.equals(start2) && end1.equals(end2)){
+            return true;
+        }
         // 如果第二个时间段的开始时间在第一个时间段内（包括两端点）
         if (start2.isAfter(start1) && start2.isBefore(end1)) {
             return true;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
index 0ff475024..59015a7d7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
@@ -416,7 +416,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         updateInterviewInfo.setAuditId(auditId);
         updateInterviewInfo.setInterviewStatus(InterviewStatusEnum.NOT_PASS.getCode());
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), null, WorkflowSubStageStatusEnum.getInterviewRejectStatus(interviewType));
-        return lineInterviewDAO.updateInterviewInfo(interviewInfo) > 0;
+        return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0;
     }
 
     @Override