From 3702e7000b4e27653108fdb6fcf741b998c6a534 Mon Sep 17 00:00:00 2001
From: "feng.li" <fengli@hsayi.com>
Date: Wed, 27 Dec 2023 18:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=9614=E5=A4=A9=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E9=9D=A2=E8=AF=95=E6=83=85=E5=86=B5=E5=8F=8A?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=917=E6=97=A5=E5=92=8C=E5=BD=93?=
 =?UTF-8?q?=E5=A4=A9=E9=9D=A2=E8=AF=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml    | 4 ++--
 .../java/com/cool/store/service/impl/DeskServiceImpl.java     | 4 +---
 .../com/cool/store/service/impl/InterviewServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
index 23ca1b16d..72fb178eb 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
@@ -272,8 +272,8 @@
 
   <select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
     select
-    ifnull(sum(if(interview_date = '2023-11-27' and room_status!=2,1,0)),0) as currentDayInterviewCount,
-    ifnull(sum(if(start_time &gt; '2023-11-01 00:00:00' and end_time &lt; '2023-11-30 23:59:59',1,0)),0) as lastSevenDayInterviewCount
+    ifnull(sum(if(interview_date = #{currentDate} and room_status!=2,1,0)),0) as currentDayInterviewCount,
+    ifnull(sum(if(start_time &gt; #{startTime} and end_time &lt;= #{endTime} ,1,0)),0) as lastSevenDayInterviewCount
     FROM hy_partner_interview_plan t1
     LEFT JOIN hy_partner_exhibition t2 ON t1.id = t2.interview_plan_id
     where interviewer = #{userId}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index ea78cb506..a8e50f910 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -1,6 +1,5 @@
 package com.cool.store.service.impl;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.HyPartnerInterviewPlanDAO;
@@ -21,7 +20,6 @@ import com.cool.store.vo.InterviewPlanVO;
 import com.cool.store.vo.InterviewScheduleInfoVO;
 import com.cool.store.vo.StageCountVO;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -51,7 +49,7 @@ public class DeskServiceImpl implements DeskService {
     public HashMap<String, InterviewPlanVO>  getInterviewPlan(String userId) {
 
         String currentDate = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY);
-        String endDate = DateUtil.format(CoolDateUtils.getDateFormatDay(new Date(), 6), CoolDateUtils.DATE_FORMAT_DAY);
+        String endDate = DateUtil.format(CoolDateUtils.getDateFormatDay(new Date(), 13), CoolDateUtils.DATE_FORMAT_DAY);
         List<AdvanceLineDTO>  currentDateInterviewList = hyPartnerInterviewPlanDAO.getCurrentDateInterviewCount(userId, currentDate,endDate);
         Map<String, Integer> dateIntegerMap = currentDateInterviewList.stream().collect(Collectors.toMap(AdvanceLineDTO::getDate, AdvanceLineDTO::getCount));
         //临期数量
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
index defc6efe4..61764e4ab 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -716,7 +716,7 @@ public class InterviewServiceImpl implements InterviewService {
         //3.3 装到槽里并返回
         //3.3.1 外层循环每一天
         for (CalendarInfo daySlot : daySlots) {
-            //3.3.2 内存循环每一天的每个时间段
+            //3.3.2 内层循环每一天的每个时间段
             List<FreeBusyInfo> freeBusyList = daySlot.getFreeBusyList();
             for (FreeBusyInfo freeBusyInfo : freeBusyList) {
                 //把日期和时间拼接成yyyy-MM-dd HH:mm格式