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

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

@@ -189,6 +189,9 @@
       <if test="keyword!=null and keyword!=''">
         and area_path like  concat('%',#{keyword},'%')
       </if>
+      <if test="areaStatus!=null and areaStatus!=''">
+        and area_status = #{areaStatus}
+      </if>
       <if test="filterData!=null and filterData==true">
         and province_city_flag = 1
       </if>

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

@@ -25,12 +25,16 @@
     <result column="weakness" jdbcType="VARCHAR" property="weakness" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="pass_cause" jdbcType="VARCHAR" property="passCause" />
+    <result column="pass_time" jdbcType="TIMESTAMP" property="passTime" />
+    <result column="pass_user" jdbcType="VARCHAR" property="passUser" />
+    <result column="pass_certify-file" jdbcType="VARCHAR" property="passCertifyFile" />
   </resultMap>
   <sql id="Base_Column_List">
     id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop, 
     want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp, 
     work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness, 
-    create_time, update_time
+    create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file
   </sql>
   <select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
     select

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>

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

@@ -264,6 +264,7 @@
   <select id="selectStagePendingCount" resultType="com.cool.store.dto.partner.StageCountDTO">
     select
       IFNULL(sum(if(workflow_stage=1 and workflow_status = 1,1,0)),0)  as intentApplyApproveCount,
+      IFNULL(sum(if(workflow_stage=2 and workflow_status = 1,1,0)),0)  as reservationInterviewCount,
       IFNULL(sum(if(workflow_stage=3 and workflow_status = 3,1,0)),0) as qualifiedInterviewCount
     from hy_partner_line_info
     <where>
@@ -462,4 +463,12 @@
     </where>
   </select>
 
+
+  <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
+    SELECT <include refid="Base_Column_List"></include>
+    FROM hy_partner_line_info
+    where deleted = 1
+    and partner_id = #{partner_id}
+  </select>
+
 </mapper>