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

hd

Browse Source
This commit is contained in:
苏竹红
2024-05-28 20:23:36 +08:00
parent 476d3c12e4
commit 989dd892c2
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,12 +108,12 @@ public class LineInfoDAO {
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus);
return lineInfo;
}
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus,
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,List<Integer> pendingInterviewStatusList,
Integer notPassingTheInterview,List<Integer> subStageStatus) {
if (StringUtils.isBlank(interviewId)){
return null;
}
List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus);
List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatusList,notPassingTheInterview,subStageStatus);
return lineInfo;
}

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

@@ -35,7 +35,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
*/
List<LineInfoDO> listByInterview(@Param("interviewId") String interviewId,
@Param("interviewType") Integer interviewType,
@Param("pendingInterviewStatus") Integer pendingInterviewStatus,
@Param("pendingInterviewStatusList") List<Integer> pendingInterviewStatusList,
@Param("notPassingTheInterview") Integer notPassingTheInterview,
@Param("codes") List<Integer> codes);

6
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -335,8 +335,10 @@
#{code}
</foreach>
</if>
<if test="pendingInterviewStatus != null ">
and ((workflow_sub_stage_status = #{pendingInterviewStatus}
<if test="pendingInterviewStatusList !=null and pendingInterviewStatusList.size>0">
<foreach collection="pendingInterviewStatusList" item="status" open="and (( workflow_sub_stage_status in (" close=")" separator=",">
#{status}
</foreach>
<if test="interviewType != null and interviewType == 1">
and first_interviewer = #{interviewId}
</if>

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -114,7 +114,7 @@ public class DeskServiceImpl implements DeskService {
public PageInfo<InterviewPendingVO> firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) {
PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(),
WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null);
Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_35.getCode()),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -147,7 +147,7 @@ public class DeskServiceImpl implements DeskService {
public PageInfo<InterviewPendingVO> secondInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) {
PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(),
WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null);
Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(),WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_110.getCode()), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());