add 小程序默认会议列表全部时,展示未结束的会议
This commit is contained in:
+3
-3
@@ -775,7 +775,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
}
|
}
|
||||||
//会议分类:1可报名/2已报名/3全部
|
//会议分类:1可报名/2已报名/3全部
|
||||||
Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
|
Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
|
||||||
//可报名或者报名状态选择可报名 1可报名/2已报名/3全部/4 app全部(可报名和进行中)
|
//可报名或者报名状态选择可报名 1可报名/2已报名/0全部/4 app全部(可报名和进行中)
|
||||||
if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
|
if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
|
||||||
//queryWrapper.ne("pms.company_contact_id",contactId);
|
//queryWrapper.ne("pms.company_contact_id",contactId);
|
||||||
queryWrapper.ge("register_deadline", now);
|
queryWrapper.ge("register_deadline", now);
|
||||||
@@ -791,10 +791,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
} else if (Objects.equals(meetingSignUpType, 2 )) {
|
} else if (Objects.equals(meetingSignUpType, 2 )) {
|
||||||
queryWrapper.eq("pms.company_contact_id", contactId);
|
queryWrapper.eq("pms.company_contact_id", contactId);
|
||||||
return baseMapper.pageListContract2(page, queryWrapper, now);
|
return baseMapper.pageListContract2(page, queryWrapper, now);
|
||||||
} else if (Objects.equals(meetingSignUpType, 3)){
|
} else if (Objects.equals(meetingSignUpType, 0)){
|
||||||
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
|
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
|
||||||
}else {
|
}else {
|
||||||
queryWrapper.lt("end_time", now);
|
queryWrapper.ge("end_time", now);
|
||||||
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
|
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user