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

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

@@ -147,6 +147,9 @@
           #{mappingId}
         </foreach>
       </if>
+      <if test="currentId!=null">
+        and a.mapping_id != #{currentId}
+      </if>
     </where>
   </select>
 

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

@@ -186,7 +186,7 @@
     hy_open_area_info
     where area_status = 'keyOpen'
     and province_city_flag = 1
-    and parent_id is null
+    and parent_id is not null
   </select>
 
   <select id="queryByKeyword" resultMap="BaseResultMap">

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

@@ -298,16 +298,16 @@
       hpli.partner_id as partnerId,
       hpli.deadline as deadline,
       hpli.workflow_status as status,
-      a.id as id,
+      a.id as interviewId,
       a.auth_code as authCode,
       a.approve_time as approveTime,
       a.process_info as processInfo,
-      b.id as interviewId,
       b.start_time as startTime,
       b.end_time as endTime,
       b.interviewer as interviewer,
       b.create_time as createTime,
-      b.room_id as roomId
+      b.room_id as roomId,
+      b.id as id
     from hy_partner_line_info hpli
     left join hy_partner_interview a on hpli.id = a.partner_line_id
     left join hy_partner_interview_plan b on a.interview_plan_id = b.id

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

@@ -531,12 +531,14 @@
     SELECT MAX(h2.create_time)
     FROM hy_partner_line_info h2
     WHERE h1.partner_id = h2.partner_id
+    and h2.deleted= 1
     <if test="partnerIdList!=null and partnerIdList.size>0">
       <foreach collection="partnerIdList" item="partnerId" open="and h1.partner_id in (" close=")" separator=",">
         #{partnerId}
       </foreach>
     </if>
     )
+
   </select>
 
   <select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
@@ -563,7 +565,7 @@
   <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>
     FROM hy_partner_line_info
-    where deleted = 1
+    where (deleted = 1 or (deleted=0 and line_status=0))
     and partner_id = #{partner_id}
   </select>