From 450342c7df0e499dbf8743f7b6846584857c0afe Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Oct 2021 10:21:52 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E8=BF=94=E5=9B=9E=E5=8F=AF=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E4=BF=A1=E6=81=AFmeetingSignUpType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      | 27 ++++++++++++++-----
 .../com/jero/meeting/entity/PayMeeting.java   |  6 +++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index ca56bb8b..07a9d1fa 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -26,11 +26,13 @@ import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.meeting.common.MeetingCommon;
 import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.entity.PayMeetingHotelContacts;
+import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingHotelContactsService;
 import com.jero.meeting.service.IPayMeetingService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.meeting.vo.PayMeetingVO;
 import com.jero.meeting.vo.PublishReminderVO;
 import com.jero.meeting.vo.UploadFileVO;
@@ -83,6 +85,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     private IPayCaseCommitteeService payCaseCommitteeService;
     @Resource
     private IPayContactsManagementService payContactsManagementService;
+    @Resource
+    private IPayMeetingSituationService payMeetingSituationService;
 
     /**
      * 分页列表查询
@@ -182,21 +186,22 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             }
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String id = sysUser.getId();
+        String contactId = sysUser.getId();
 
         //会议报名状态：1可报名/2已报名
         String meetingSignUpType = req.getParameter("meetingSignUpType");
         if (Objects.equals(meetingSignUpType, 1 + "")) {
-            queryWrapper.eq("pmrr.contact_id", id);
+            queryWrapper.eq("pmrr.contact_id", contactId);
+            queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
         } else if (Objects.equals(meetingSignUpType, 2 + "")) {
-            queryWrapper.eq("pms.company_contact_id", id);
+            queryWrapper.eq("pms.company_contact_id", contactId);
         } else {
             queryWrapper.and(
-                    a -> a.eq("pms.company_contact_id", id)
+                    a -> a.eq("pms.company_contact_id", contactId)
                             .or()
-                            .eq("pms.post_contact_id", id)
+                            .eq("pms.post_contact_id", contactId)
                             .or()
-                            .eq("pmrr.contact_id", id)
+                            .eq("pmrr.contact_id", contactId)
             );
         }
 
@@ -210,6 +215,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             String departName = departNamesByUsername.get(0);
             meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
             meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
+        //    查询用户是否已报名此会议
+            LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayMeetingSituation::getMeetingId,meeting.getId());
+            wrapper.eq(PayMeetingSituation::getCompanyContactId,contactId);
+            int count = payMeetingSituationService.count(wrapper);
+            if (count > 0){
+                meeting.setMeetingSignUpType(2);
+            }else {
+                meeting.setMeetingSignUpType(1);
+            }
         }
 
         return Result.OK(pageList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index 4f735081..0b30b4d2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -282,4 +282,10 @@ public class PayMeeting implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM")
     @DateTimeFormat(pattern="yyyy-MM")
     private Date month;
+
+    /**
+     * 会议可报名状态：1可报名/2已报名
+     */
+    @TableField(exist = false)
+    private Integer meetingSignUpType;
 }