webc根据会销组id查询线索报名会销信息
This commit is contained in:
@@ -124,11 +124,11 @@ public class HyExhibitionDAO {
|
|||||||
return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId);
|
return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionId, Long partnerLineId) {
|
public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) {
|
||||||
if (exhibitionId == null || partnerLineId == null) {
|
if (exhibitionGroupId == null || partnerLineId == null) {
|
||||||
return new PartnerExhibitionInfoVO();
|
return new PartnerExhibitionInfoVO();
|
||||||
}
|
}
|
||||||
return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionId, partnerLineId);
|
return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<HyExhibitionDO> querySelective(HyExhibitionDO hyExhibitionDO) {
|
public List<HyExhibitionDO> querySelective(HyExhibitionDO hyExhibitionDO) {
|
||||||
|
|||||||
@@ -76,11 +76,11 @@ public interface HyExhibitionMapper {
|
|||||||
/**
|
/**
|
||||||
* 获取线索报名的会销详情
|
* 获取线索报名的会销详情
|
||||||
*
|
*
|
||||||
* @param exhibitionId
|
* @param exhibitionGroupId
|
||||||
* @param partnerLineId
|
* @param partnerLineId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionId") Integer exhibitionId, @Param("partnerLineId") Long partnerLineId);
|
PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("partnerLineId") Long partnerLineId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询符合条件的会销列表
|
* 查询符合条件的会销列表
|
||||||
|
|||||||
@@ -452,12 +452,13 @@
|
|||||||
t1.location AS exhibitionPosition
|
t1.location AS exhibitionPosition
|
||||||
FROM `hy_exhibition` t1
|
FROM `hy_exhibition` t1
|
||||||
INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id
|
INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id
|
||||||
|
INNER JOIN `hy_exhibition_group` t3 ON t1.exhibition_group_id = t3.id
|
||||||
WHERE t1.deleted = 0
|
WHERE t1.deleted = 0
|
||||||
AND t1.closed_type = 0
|
AND t1.closed_type = 0
|
||||||
AND t2.deleted = 0
|
AND t2.deleted = 0
|
||||||
AND t2.participation_status != 7
|
AND t2.participation_status != 7
|
||||||
AND t2.partner_line_id = #{partnerLineId}
|
AND t2.partner_line_id = #{partnerLineId}
|
||||||
AND t1.id = #{exhibitionId}
|
AND t3.id = #{exhibitionGroupId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="batchCloseExhibition">
|
<update id="batchCloseExhibition">
|
||||||
|
|||||||
@@ -155,11 +155,11 @@ public interface ExhibitionService {
|
|||||||
/**
|
/**
|
||||||
* 获取线索参加的会销详情
|
* 获取线索参加的会销详情
|
||||||
*
|
*
|
||||||
* @param exhibitionId
|
* @param exhibitionGroupId
|
||||||
* @param partnerLineId
|
* @param partnerLineId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId);
|
PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 自动结束会销
|
* 自动结束会销
|
||||||
|
|||||||
@@ -740,8 +740,8 @@ public class ExhibitionServiceImpl implements ExhibitionService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId) {
|
public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) {
|
||||||
return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionId, partnerLineId);
|
return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -53,9 +53,9 @@ public class ExhibitionController {
|
|||||||
|
|
||||||
@GetMapping("/getExhibitionInfo")
|
@GetMapping("/getExhibitionInfo")
|
||||||
@ApiOperation("线索参加的会销详情")
|
@ApiOperation("线索参加的会销详情")
|
||||||
public ResponseResult<PartnerExhibitionInfoVO> getExhibitionInfo(@RequestParam(required = true, value = "exhibitionId") Integer exhibitionId) {
|
public ResponseResult<PartnerExhibitionInfoVO> getExhibitionInfo(@RequestParam(required = true, value = "exhibitionGroupId") Integer exhibitionGroupId) {
|
||||||
PartnerUserInfoVO user = PartnerUserHolder.getUser();
|
PartnerUserInfoVO user = PartnerUserHolder.getUser();
|
||||||
return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionId, user.getPartnerLineId()));
|
return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionGroupId, user.getPartnerLineId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user