suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
苏竹红
2023-12-27 17:06:08 +08:00
parent 2b9a1c2943 ac81c9111b
commit d3841f3044
10 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java
View File

@@ -3,7 +3,6 @@ package com.cool.store.dao;
import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO;
import com.cool.store.dto.exhibition.ExhibitionLineDTO;
import com.cool.store.dto.exhibition.PartnerSignUpDTO;
import com.cool.store.entity.HyExhibitionDO;
import com.cool.store.entity.HyPartnerExhibitionDO;
import com.cool.store.entity.HyPartnerExhibitionInterviewDO;
import com.cool.store.mapper.HyPartnerExhibitionMapper;
@@ -111,7 +110,7 @@ public class HyPartnerExhibitionDAO {
return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds);
}
public List<Long> queryListByLineIds(List<Long> lindIds) {
public List<HyPartnerExhibitionDO> queryListByLineIds(List<Long> lindIds) {
if (ObjectUtils.isEmpty(lindIds)) {
return new ArrayList<>();
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java
View File

@@ -81,7 +81,7 @@ public interface HyPartnerExhibitionMapper {
* @param lindIds
* @return
*/
List<Long> queryListByLineIds(@Param("lineIds") List<Long> lindIds);
List<HyPartnerExhibitionDO> queryListByLineIds(@Param("lineIds") List<Long> lindIds);
/**
* 查询线索参加的会销面试相关信息

21
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -377,10 +377,10 @@
)
</select>
<select id="queryListByLineIds" resultType="java.lang.Long">
SELECT partner_line_id
<select id="queryListByLineIds" resultMap="BaseResultMap">
SELECT partner_line_id, exhibition_id, t3.name AS exhibitionCreatorName, t3.mobile AS exhibitionCreatorMobile
FROM (
SELECT partner_line_id, exhibition_id
SELECT partner_line_id, exhibition_id, creator
FROM hy_partner_exhibition
WHERE partner_line_id IN (
<foreach collection="lineIds" item="lineId" separator=",">
@@ -388,14 +388,16 @@
</foreach>
)
AND deleted = 0
-- 面试中状态
AND participation_status = 4
) t1
LEFT JOIN (
INNER JOIN (
SELECT id, closed_type
FROM hy_exhibition
WHERE deleted = 0
AND closed_type = 0
) t2 ON t1.exhibition_id = t2.id
INNER JOIN enterprise_user t3 ON t1.creator = t3.user_id
WHERE closed_type = 0
</select>
<select id="queryPartnerExhibitionInterviewInfo"
@@ -404,17 +406,20 @@
exhibition_id AS exhibitionId,
interview_plan_id AS interviewPlanId,
exhibition_name AS exhibitionName,
start_date AS exhibitionDate
start_date AS exhibitionDate,
name AS exhibitionCreatorName,
mobile AS exhibitionCreatorMobile
FROM (
SELECT exhibition_id, interview_plan_id
FROM hy_partner_exhibition
WHERE deleted = 0
AND partner_line_id = #{partnerLineId}
AND interview_plan_id = #{interviewPlanId}
) t1 LEFT JOIN (
SELECT id, exhibition_name, start_date
) t1 INNER JOIN (
SELECT hy_exhibition.id, exhibition_name, start_date, enterprise_user.name, enterprise_user.mobile
FROM hy_exhibition
WHERE deleted = 0
INNER JOIN enterprise_user ON hy_exhibition.creator = enterprise_user.user_id
WHERE hy_exhibition.deleted = 0
) t2 ON t1.exhibition_id = t2.id
</select>