From 54b1c4b0899e5308547a2eb473dba25a6b974436 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Apr 2022 18:05:39 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=9C=AA=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2022-1-4变更.sql                             |  2 +-
 .../service/impl/PayMeetingServiceImpl.java     | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql
index 6ae31250..57bb2e1b 100644
--- a/db/2022-1-4变更.sql
+++ b/db/2022-1-4变更.sql
@@ -177,7 +177,7 @@ update sys_user set sys_user.work_no = (select sheet0.username from sheet0 where
 
 DROP TABLE IF EXISTS `sheet0`;
 
---2022-04-12 合同变更
+-- 2022-04-12 合同变更
 alter TABLE pay_spending_contract ADD (phone VARCHAR(22) COMMENT '联系电话',address VARCHAR(255) COMMENT '邮寄地址',post_code VARCHAR(50) COMMENT '邮编');
 alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类型：1 支出合同，2 收入合同');
 INSERT INTO `sys_dict` VALUES ('1509830472616779778', '合同类型', 'contract_type', '（1：支出合同，2：收入合同）', 0, 'LKGLZ', '2022-04-01 17:50:11', 'LKGLZ', '2022-04-01 17:51:38', 0);
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 dcf4356d..2e90a562 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
@@ -728,10 +728,7 @@ 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){
@@ -776,9 +773,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 //    break;
             }
         }
-
-        //可报名或者报名状态选择可报名  1可报名/2已报名
-        if (Objects.equals(meetingSignUpType, 1 + "")||Objects.equals(signUpStatus,8)) {
+        //会议分类：1可报名/2已报名/3全部
+        Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
+        //可报名或者报名状态选择可报名  1可报名/2已报名/3全部/4 app全部(可报名和进行中)
+        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);
@@ -790,10 +788,13 @@ 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 + "")) {
+        } else if (Objects.equals(meetingSignUpType, 2 )) {
             queryWrapper.eq("pms.company_contact_id", contactId);
             return baseMapper.pageListContract2(page, queryWrapper, now);
-        } else {
+        } else if (Objects.equals(meetingSignUpType, 3)){
+            return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
+        }else {
+            queryWrapper.lt("end_time", now);
             return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
         }
     }