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

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java

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

@@ -305,5 +305,9 @@
             enterprise_user
         where
             deleted = 0  and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
+        ORDER BY
+        CASE WHEN jobnumber='' OR jobnumber IS NULL THEN 1 ELSE 0 END,
+        SUBSTR(jobnumber,1,1),
+        CAST(SUBSTR(jobnumber,2) AS UNSIGNED) ASC
     </select>
 </mapper>

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

@@ -137,4 +137,18 @@
     where
       deleted = 0 and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId">associated_region_id like concat("%", #{regionId}, "%")</foreach>
   </select>
+
+
+  <select id="selectByIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from hy_intend_dev_zone_info
+    <where>
+      <if test="ids !=null and ids.size>0">
+        <foreach collection="ids" item="id" open="and id in (" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -135,9 +135,13 @@
   <select id="selectByOpenAreaMappingIdList" resultType="com.cool.store.dto.partner.ZoneCheckDTO">
     select
     a.open_area_mapping_id  as openAreaMappingId,
-    b.zone_name as zoneName
+    b.zone_name as zoneName,
+    b.id as zoneId
     from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id
     <where>
+      <if test="type!=null and type !=''">
+        and type = #{type}
+      </if>
       <if test="openAreaMappingIdList!=null and openAreaMappingIdList.size>0">
         <foreach collection="openAreaMappingIdList" open="and a.open_area_mapping_id in (" close=")" separator="," item="mappingId">
           #{mappingId}
@@ -145,4 +149,18 @@
       </if>
     </where>
   </select>
+
+  <select id="selectByOpenAreaMappingId" resultMap="BaseResultMap">
+    select
+    *
+    from hy_intend_developement_mapping a
+    <where>
+      <if test="type!=null and type !=''">
+        and a.type = #{type}
+      </if>
+      <if test="openAreaMappingId!=null">
+        and a.open_area_mapping_id = #{openAreaMappingId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -27,6 +27,21 @@
     id_card_photo_front, id_card_photo_black, live_address, user_portrait, status, latest_log_message, 
     pass_reason, certify_file, create_time, update_time
   </sql>
+
+  <insert id="batchInsert">
+    insert into
+    hy_partner_base_info
+    (
+    partner_id,
+    partner_line_id
+    )
+    values
+    <foreach collection="records" item="record" separator=",">
+      (#{record.partnerId},
+      #{record.partnerLineId}
+    </foreach>
+  </insert>
+
   <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
     insert into hy_partner_base_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -142,6 +157,9 @@
       </if>
     </trim>
   </insert>
+
+
+
   <update id="updateByPrimaryKeySelective">
     update hy_partner_base_info
     <set>
@@ -203,6 +221,18 @@
     where id = #{record.id}
   </update>
 
+  <update id="updateByPrimaryKey">
+    update hy_partner_base_info
+    set
+    nation = #{record.nation},
+    birthdate = #{record.birthdate},
+    id_card = #{record.idCard},
+    id_card_photo_front = #{record.idCardPhotoFront},
+    id_card_photo_black = #{record.idCardPhotoBlack},
+    live_address = #{record.liveAddress}
+    where id = #{record.id}
+  </update>
+
 
   <update id="updateByPartnerId">
   update hy_partner_base_info
@@ -231,9 +261,22 @@
     where partner_line_id = #{partnerLineId}
   </select>
 
-  <select id="getLineIdByIdCard" resultType="java.lang.Long">
+  <select id="getByPartnerLineIds" resultMap="BaseResultMap" >
     select
-    partner_line_id
+    <include refid="Base_Column_List"></include>
+    from hy_partner_base_info
+    <where>
+      <if test="partnerLineIds !=null and partnerLineIds.size>0">
+        <foreach collection="partnerLineIds" item="lineId" open="and partner_line_id in (" close=")" separator=",">
+          #{lineId}
+        </foreach>
+      </if>
+    </where>
+  </select>
+
+  <select id="getByIdCard" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
     from hy_partner_base_info
     where id_card = #{idCard}
   </select>

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

@@ -36,7 +36,7 @@
   </select>
 
 
-  <insert id="batchInsert">
+  <insert id="batchInsert"  keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
     insert into
     hy_partner_line_info
     (
@@ -323,7 +323,7 @@
     <include refid="Base_Column_List"></include>
     from hy_partner_line_info
     <where>
-      <if test="userId">
+      <if test="userId != null">
         and investment_manager = #{userId}
       </if>
       <if test="lastMonthTodayDate!=null">

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

@@ -43,11 +43,13 @@
     select
     <include refid="Base_Column_List"></include>
     from hy_partner_user_info
-    <if test="partnerIdList!=null and partnerIdList.size>0">
-      <foreach collection="partnerIdList" open="and partner_id in (" close=")" separator="," item="partnerId">
-        #{partnerId}
-      </foreach>
-    </if>
+    <where>
+      <if test="partnerIdList!=null and partnerIdList.size>0">
+        <foreach collection="partnerIdList" open="and partner_id in (" close=")" separator="," item="partnerId">
+          #{partnerId}
+        </foreach>
+      </if>
+    </where>
   </select>
 
   <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">