LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 企业端会议的回显

Browse Source
This commit is contained in:
lijiarao
2021-12-23 11:23:20 +08:00
parent d96220c654
commit 1526068940
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+2 -2
View File
@@ -173,9 +173,9 @@
NULL AS check_result,
NULL AS check_in
FROM pay_meeting pm
WHERE pm.meeting_type = 2
WHERE (pm.meeting_type = 2
OR pm.meeting_type = 3
OR pm.meeting_type = 4
OR pm.meeting_type = 4)
and pm.id not in (SELECT pm.id
FROM pay_meeting pm
LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+13 -10
View File
@@ -633,7 +633,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.orderByDesc("start_time");
//
//会议分类：1可报名/2已报名/3全部
String meetingSignUpType = request.getParameter("meetingSignUpType");
//会议报名状态
Integer signUpStatus = payMeeting.getSignUpStatus();
if (Objects.nonNull(signUpStatus)) {
switch (signUpStatus){
@@ -662,15 +665,16 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
case 7:
queryWrapper.eq("check_in",1);
break;
case 8:
queryWrapper.ge("register_deadline", now);
queryWrapper.ge("end_time", now);
break;
// 可报名与会议报名状态重复
//case 8:
// queryWrapper.ge("register_deadline", now);
// queryWrapper.ge("end_time", now);
// break;
}
}
//会议报名状态：1可报名/2已报名
String meetingSignUpType = request.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType, 1 + "")) {
//可报名或者报名状态选择可报名
if (Objects.equals(meetingSignUpType, 1 + "")||Objects.equals(signUpStatus,8)) {
//queryWrapper.ne("pms.company_contact_id",contactId);
queryWrapper.ge("register_deadline", now);
queryWrapper.ge("end_time", now);
@@ -686,8 +690,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.groupBy("meeting_name");
queryWrapper.having("company_contact_ids not like concat('%',{0},'%') or company_contact_ids is null",contactId);
return baseMapper.pageListContract(page, queryWrapper, now);
} else if (Objects.equals(meetingSignUpType, 2 + "")
||Objects.nonNull(signUpStatus)) {
} else if (Objects.equals(meetingSignUpType, 2 + "")) {
queryWrapper.eq("pms.company_contact_id", contactId);
return baseMapper.pageListContract2(page, queryWrapper, now);
} else {