From aad7bedce3492dab96f5b9b35bfe81caa6352208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 28 Jun 2023 20:44:41 +0800 Subject: [PATCH] userInfo --- .../com/cool/store/dao/HyPartnerInterviewPlanDAO.java | 4 ++-- .../store/mapper/HyPartnerInterviewPlanMapper.java | 3 ++- .../resources/mapper/HyPartnerInterviewPlanMapper.xml | 5 ++++- .../impl/HyPartnerInterviewPlanServiceImpl.java | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java index 6d4e544bd..eb00c0c47 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java @@ -75,11 +75,11 @@ public class HyPartnerInterviewPlanDAO { * @param workflowStatus * @return */ - public List getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){ + public List getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus,Boolean filter){ if (StringUtils.isEmpty(userId)){ return Lists.newArrayList(); } - return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus); + return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus,filter); } public Long selectInterviewIdByLineId(Long lineId){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index c36dd2529..026de0d9a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -72,7 +72,8 @@ public interface HyPartnerInterviewPlanMapper { */ List getPartnerInterviewInfoList(@Param("userId") String userId, @Param("workflowStage") String workflowStage , - @Param("workflowStatus") String workflowStatus); + @Param("workflowStatus") String workflowStatus, + @Param("filter") Boolean filter); /** * 查询面试列表 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 227fd07e5..ad7094ddd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -312,7 +312,10 @@ 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 - and hpli.deleted = 0 and hpli.line_status!=3 and b.deleted = 0 + and hpli.deleted = 0 and hpli.line_status!=3 + + and b.deleted = 0 + and hpli.workflow_stage = #{workflowStage} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index dcc219dc4..b47c93e32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -65,6 +65,9 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan @Autowired private HyInterviewDAO interviewDAO; + @Resource + EnterpriseUserDAO enterpriseUserDAO; + @Override @@ -90,9 +93,6 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan return result; } - @Resource - EnterpriseUserDAO enterpriseUserDAO; - @Override public PageInfo getPartnerInterviewInfoList(String userId ,String type,Integer pageSize,Integer pageNumber) { String workflowStatus = ""; @@ -104,7 +104,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan } 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 list = partnerInterviewInfoList.getList(); if (CollectionUtils.isEmpty(list)){ return partnerInterviewInfoList; @@ -145,7 +145,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan 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 list = partnerInterviewInfoList.getList(); if (CollectionUtils.isEmpty(list)){ return partnerInterviewInfoList;