Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init
This commit is contained in:
@@ -108,11 +108,12 @@ public class LineInfoDAO {
|
||||
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus);
|
||||
return lineInfo;
|
||||
}
|
||||
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,List<Integer> subStageStatus) {
|
||||
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus,
|
||||
Integer notPassingTheInterview,List<Integer> subStageStatus) {
|
||||
if (StringUtils.isBlank(interviewId)){
|
||||
return null;
|
||||
}
|
||||
List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,subStageStatus);
|
||||
List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus);
|
||||
return lineInfo;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,11 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
|
||||
* @param codes
|
||||
* @return
|
||||
*/
|
||||
List<LineInfoDO> listByInterview(@Param("interviewId") String interviewId, @Param("interviewType") Integer interviewType, @Param("codes") List<Integer> codes);
|
||||
List<LineInfoDO> listByInterview(@Param("interviewId") String interviewId,
|
||||
@Param("interviewType") Integer interviewType,
|
||||
@Param("pendingInterviewStatus") Integer pendingInterviewStatus,
|
||||
@Param("notPassingTheInterview") Integer notPassingTheInterview,
|
||||
@Param("codes") List<Integer> codes);
|
||||
|
||||
/**
|
||||
* 我的线索列表
|
||||
|
||||
@@ -330,17 +330,28 @@
|
||||
<select id="listByInterview" resultMap="BaseResultMap">
|
||||
select * from xfsg_line_info
|
||||
where deleted = 0 and line_status = 1
|
||||
<if test="interviewType != null and interviewType == 1">
|
||||
and first_interviewer = #{interviewId}
|
||||
</if>
|
||||
<if test="interviewType != null and interviewType == 2">
|
||||
and second_interviewer = #{interviewId}
|
||||
</if>
|
||||
<if test="codes !=null and codes.size>0">
|
||||
<foreach collection="codes" item="code" open="and workflow_sub_stage_status in (" close=")" separator=",">
|
||||
#{code}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="pendingInterviewStatus != null ">
|
||||
and ((workflow_sub_stage_status = #{pendingInterviewStatus}
|
||||
<if test="interviewType != null and interviewType == 1">
|
||||
and first_interviewer = #{interviewId}
|
||||
</if>
|
||||
<if test="interviewType != null and interviewType == 2">
|
||||
and second_interviewer = #{interviewId}
|
||||
</if>
|
||||
)
|
||||
</if>
|
||||
<if test="notPassingTheInterview != null ">
|
||||
or (workflow_sub_stage_status = #{notPassingTheInterview}
|
||||
and investment_manager = #{interviewId}
|
||||
))
|
||||
</if>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user