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

私海列表线索报名会销相关信息查询错误

Browse Source
This commit is contained in:
feng.li
2024-01-09 13:34:14 +08:00
parent 786f674a90
commit 39e03b0619
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,11 +111,11 @@ public class HyPartnerExhibitionDAO {
return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds);
}
public List<HyPartnerExhibitionDO> queryListByLineIds(List<Long> lindIds) {
if (ObjectUtils.isEmpty(lindIds)) {
public List<HyPartnerExhibitionDO> queryListByLineIds(List<Long> lindIds, Integer exhibitionPartnerStatusCode) {
if (ObjectUtils.isEmpty(lindIds) || exhibitionPartnerStatusCode == null) {
return new ArrayList<>();
}
return hyPartnerExhibitionMapper.queryListByLineIds(lindIds);
return hyPartnerExhibitionMapper.queryListByLineIds(lindIds, exhibitionPartnerStatusCode);
}
public HyPartnerExhibitionInterviewDO queryPartnerExhibitionInterviewInfo(Long interviewPlanId, Long partnerLineId) {

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

@@ -79,10 +79,12 @@ public interface HyPartnerExhibitionMapper {
/**
* 查询处在会销面试状态中的线索ids
*
* @param lindIds
* @param exhibitionPartnerStatusCode
* @return
*/
List<HyPartnerExhibitionDO> queryListByLineIds(@Param("lineIds") List<Long> lindIds);
List<HyPartnerExhibitionDO> queryListByLineIds(@Param("lineIds") List<Long> lindIds, @Param("status") Integer exhibitionPartnerStatusCode);
/**
* 查询线索参加的会销面试相关信息

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

@@ -384,7 +384,7 @@
<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, creator
SELECT partner_line_id, exhibition_id
FROM hy_partner_exhibition
WHERE partner_line_id IN (
<foreach collection="lineIds" item="lineId" separator=",">
@@ -393,16 +393,15 @@
)
AND deleted = 0
-- 面试中状态
AND participation_status = 4
AND participation_status = #{status}
) t1
INNER JOIN (
SELECT id, closed_type
SELECT id, creator
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
INNER JOIN enterprise_user t3 ON t2.creator= t3.user_id
</select>
<select id="queryPartnerExhibitionInterviewInfo"
resultType="com.cool.store.entity.HyPartnerExhibitionInterviewDO">

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -687,7 +687,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
//查询处在会销面试中的线索
List<HyPartnerExhibitionDO> partnerExhibitions = new ArrayList<>();
if (CollUtil.isNotEmpty(exhibitionLineIds)) {
partnerExhibitions = partnerExhibitionDAO.queryListByLineIds(exhibitionLineIds);
partnerExhibitions = partnerExhibitionDAO.queryListByLineIds(exhibitionLineIds, ExhibitionPartnerStatus.INTERVIEWING.getCode());
}
List<HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanDAO.getHyPartnerInterviewPlanByLineIds(lindIds);
Map<Long, HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOMap = hyPartnerInterviewPlanDOS.stream().collect(Collectors.toMap(HyPartnerInterviewPlanDO::getPartnerLineId, data -> data));