From 152606894042544caee735a83ba363546d90aa9c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 23 Dec 2021 11:23:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E7=9A=84=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/mapper/xml/PayMeetingMapper.xml   |  4 ++--
 .../service/impl/PayMeetingServiceImpl.java   | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index d6d2df5b..56f575c9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -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
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index e622d977..527a9b67 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -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 {