Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml

@@ -196,10 +196,11 @@
 
   <select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
     select
-      sum(if(interview_date=#{currentDate},1,0)) as currentDayInterviewCount,
-      sum(if(start_time>#{startTime} and #{endTime},1,0)) as lastSevenDayInterviewCount
+      ifnull(sum(if(interview_date=#{currentDate},1,0)),0) as currentDayInterviewCount,
+      ifnull(sum(if(start_time>#{startTime} and #{endTime},1,0)),0) as lastSevenDayInterviewCount
     FROM hy_partner_interview_plan
     where interviewer = #{userId}
+    and application_approved = 0
   </select>
 
   <select id="getInterviewPlanList" resultMap="BaseResultMap">
@@ -212,6 +213,7 @@
         and interview_date = #{currentDate}
       </if>
       and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2))
+      and application_approved = 0
       order by start_time
     </where>
   </select>
@@ -237,11 +239,8 @@
       <if test="userId!=null and userId!=''">
         and a.interviewer = #{userId}
       </if>
-      <if test="workflowStage!=null and workflowStage!=''">
-        and a.workflow_stage= #{workflowStage}
-      </if>
       <if test="workflowStatus!=null and workflowStatus!=''">
-        and a.workflow_status = #{workflowStatus}
+        and a.status = #{workflowStatus}
       </if>
     </where>
   </select>