From db7973a80a08a52edda7713bd92e07b35813c297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sun, 25 Jun 2023 20:14:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E6=97=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
index 40c8554e0..994cb0277 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
@@ -277,11 +277,11 @@
 
   <select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
     select
-      ifnull(sum(if(interview_date=#{currentDate},1,0)),0) as currentDayInterviewCount,
+      ifnull(sum(if(start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2),1,0)),0) as currentDayInterviewCount,
       ifnull(sum(if(start_time>#{startTime} and end_time <![CDATA[<]]> #{endTime},1,0)),0) as lastSevenDayInterviewCount
     FROM hy_partner_interview_plan
     where interviewer = #{userId}
-    and application_approved = 0
+    and application_approved = 1
   </select>
 
   <select id="getInterviewPlanList" resultMap="BaseResultMap">
@@ -294,7 +294,7 @@
         and interview_date = #{currentDate}
       </if>
       and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2))
-      and application_approved = 0
+      and application_approved = 1
       order by start_time
     </where>
   </select>
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 5ade9fde1..c03be5ef6 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -538,6 +538,7 @@
   <select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
     SELECT partner_id,  IFNULL(COUNT(1), 0)  AS followCount
     FROM hy_partner_line_info
+    where deleted = 1
     GROUP BY partner_id;
   </select>
 
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 9f36c32d9..8489cf301 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
@@ -64,7 +64,7 @@ public class DeskServiceImpl implements DeskService {
         InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO();
         //查询面试数量
 
-        String currentDate = DateUtil.format(dateTime,  CoolDateUtils.DATE_FORMAT_DAY);
+        String currentDate = DateUtil.format(dateTime,  CoolDateUtils.DATE_FORMAT_SEC);
         String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), CoolDateUtils.DATE_FORMAT_SEC);
         String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC);
         SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime);

From b6e395dc9ea3fcb466fdd72d625e71dd7916b27b Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Sun, 25 Jun 2023 21:19:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?800=E5=B9=B3=E5=8F=B0=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=9E=E8=B0=83=E6=88=90=E5=8A=9F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/service/impl/FlowServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
index b9a73f109..b6ce5b439 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -213,6 +213,7 @@ public class FlowServiceImpl implements FlowService {
         } else if ("CANCELED".equals(request.getSequenceStatus())) {
             interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7);
         }
+        log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request));
     }