This commit is contained in:
苏竹红
2023-06-28 20:44:41 +08:00
parent 4519286928
commit aad7bedce3
4 changed files with 13 additions and 9 deletions

View File

@@ -75,11 +75,11 @@ public class HyPartnerInterviewPlanDAO {
* @param workflowStatus * @param workflowStatus
* @return * @return
*/ */
public List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){ public List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus,Boolean filter){
if (StringUtils.isEmpty(userId)){ if (StringUtils.isEmpty(userId)){
return Lists.newArrayList(); return Lists.newArrayList();
} }
return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus); return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus,filter);
} }
public Long selectInterviewIdByLineId(Long lineId){ public Long selectInterviewIdByLineId(Long lineId){

View File

@@ -72,7 +72,8 @@ public interface HyPartnerInterviewPlanMapper {
*/ */
List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(@Param("userId") String userId, List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(@Param("userId") String userId,
@Param("workflowStage") String workflowStage , @Param("workflowStage") String workflowStage ,
@Param("workflowStatus") String workflowStatus); @Param("workflowStatus") String workflowStatus,
@Param("filter") Boolean filter);
/** /**
* 查询面试列表 * 查询面试列表

View File

@@ -312,7 +312,10 @@
left join hy_partner_interview a on hpli.id = a.partner_line_id 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_interview_plan b on a.interview_plan_id = b.id
<where> <where>
and hpli.deleted = 0 and hpli.line_status!=3 and b.deleted = 0 and hpli.deleted = 0 and hpli.line_status!=3
<if test="filter">
and b.deleted = 0
</if>
<if test="workflowStage!=null and workflowStage!=''"> <if test="workflowStage!=null and workflowStage!=''">
and hpli.workflow_stage = #{workflowStage} and hpli.workflow_stage = #{workflowStage}
</if> </if>

View File

@@ -65,6 +65,9 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
@Autowired @Autowired
private HyInterviewDAO interviewDAO; private HyInterviewDAO interviewDAO;
@Resource
EnterpriseUserDAO enterpriseUserDAO;
@Override @Override
@@ -90,9 +93,6 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
return result; return result;
} }
@Resource
EnterpriseUserDAO enterpriseUserDAO;
@Override @Override
public PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId ,String type,Integer pageSize,Integer pageNumber) { public PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId ,String type,Integer pageSize,Integer pageNumber) {
String workflowStatus = ""; String workflowStatus = "";
@@ -104,7 +104,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
} }
PageHelper.startPage(pageNumber,pageSize); PageHelper.startPage(pageNumber,pageSize);
//查询预约面试列表 //查询预约面试列表
PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus)); PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus,Boolean.FALSE));
List<PartnerInterviewInfoDTO> list = partnerInterviewInfoList.getList(); List<PartnerInterviewInfoDTO> list = partnerInterviewInfoList.getList();
if (CollectionUtils.isEmpty(list)){ if (CollectionUtils.isEmpty(list)){
return partnerInterviewInfoList; return partnerInterviewInfoList;
@@ -145,7 +145,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
PageHelper.startPage(pageNumber,pageSize); PageHelper.startPage(pageNumber,pageSize);
//查询预约面试列表 //查询预约面试列表
PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus)); PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus,Boolean.TRUE));
List<PartnerInterviewInfoDTO> list = partnerInterviewInfoList.getList(); List<PartnerInterviewInfoDTO> list = partnerInterviewInfoList.getList();
if (CollectionUtils.isEmpty(list)){ if (CollectionUtils.isEmpty(list)){
return partnerInterviewInfoList; return partnerInterviewInfoList;