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

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java

@@ -104,4 +104,8 @@ public class HyOpenAreaInfoDAO {
         }
         return hyOpenAreaInfoMapper.selectById(id);
     }
+
+    public List<HyOpenAreaInfoDO> getAllOpenArea(){
+        return hyOpenAreaInfoMapper.getAllOpenArea();
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java

@@ -105,5 +105,11 @@ public interface HyOpenAreaInfoMapper {
 
     HyOpenAreaInfoDO selectById(@Param("id") Long id);
 
+    /**
+     * 获取所有的区域
+     * @return
+     */
+    List<HyOpenAreaInfoDO> getAllOpenArea();
+
 
 }

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

@@ -281,4 +281,8 @@
     </where>
   </select>
 
+  <select id="getAllOpenArea" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"/> from hy_open_area_info
+  </select>
+
 </mapper>

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

@@ -307,10 +307,12 @@
       b.interviewer as interviewer,
       b.create_time as createTime,
       b.room_id as roomId,
-      b.id as id
+      b.id as id,
+      hpci.intention_contract_no as intentionContractNo
     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
+    left join hy_partner_certification_info hpci on hpci.partner_interview_id =  a.id
     <where>
       and hpli.deleted = 0 and hpli.line_status!=3
       <if test="filter">