From cb13a3c026801041d7601770905686aae722c4ec Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 15 Dec 2021 19:24:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=A5=E5=90=8D=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      |  6 +++++
 .../jero/meeting/mapper/PayMeetingMapper.java |  8 ++++---
 .../meeting/mapper/xml/PayMeetingMapper.xml   |  7 ++++++
 .../service/impl/PayMeetingServiceImpl.java   | 22 +++++++++++--------
 4 files changed, 31 insertions(+), 12 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 a6727a9f..2e651e2e 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
@@ -167,6 +167,12 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 }
 
             } else {
+                Date now = new Date();
+                Date registerDeadline = meeting.getRegisterDeadline();
+                Date endTime = meeting.getEndTime();
+                if (DateUtil.compare(now, registerDeadline) < 0 && DateUtil.compare(now, endTime) < 0) {
+                    meeting.setSignUpStatus(8);
+                }
                 meeting.setMeetingSignUpType(1);
                 meeting.setPayMode(null);
             }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
index efa7ba9c..3bbc7147 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
@@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Param;
 import com.jero.meeting.entity.PayMeeting;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Date;
+
 /**
  * @Description: 会议管理
  * @Author: jero-boot
@@ -18,15 +20,15 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
 
     IPage<PayMeeting> pageListContract(Page<PayMeeting> page,
                                         @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
-                                        @Param("now") String now);
+                                        @Param("now") Date now);
 
     IPage<PayMeeting> pageListContract2(Page<PayMeeting> page,
                                         @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
-                                        @Param("now") String now);
+                                        @Param("now") Date now);
 
     IPage<PayMeeting> pageListContract3(Page<PayMeeting> page,
                                         @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
-                                        @Param("now") String now,
+                                        @Param("now") Date now,
                                         @Param("contactId") String contactId);
 
     IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
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 3626d44a..83e899bd 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
@@ -174,6 +174,13 @@
                      WHERE pm.meeting_type = 2
                         OR pm.meeting_type = 3
                         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
+                                    LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id
+                                    WHERE pms.company_contact_id = #{contactId}
+                                    OR pms.post_contact_id = #{contactId}
+                                    OR pmrr.contact_id = #{contactId})
                      ) result
                 ${ew.customSqlSegment}
     </select>
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 62e8b849..fcebc3fe 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
@@ -614,18 +614,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             );
         }
         String meetingStatus = request.getParameter("meetingStatus");
-        String now = DateUtil.formatDate(new Date());
+        Date now = new Date();
         if (StringUtils.isNotBlank(meetingStatus)) {
             switch (meetingStatus) {
                 case MeetingCommon.MEETING_STATUS_2:
-                    queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
+                    queryWrapper.gt("start_time", now);
                     break;
                 case MeetingCommon.MEETING_STATUS_3:
-                    queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
-                    queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
+                    queryWrapper.le("start_time", now);
+                    queryWrapper.ge("end_time", now);
                     break;
                 case MeetingCommon.MEETING_STATUS_4:
-                    queryWrapper.lt("date_format(end_time,'%Y-%m-%d')", now);
+                    queryWrapper.lt("end_time", now);
                     break;
             }
         }
@@ -656,11 +656,15 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 case 5:
                     queryWrapper.eq("check_result",2);
                     break;
+                case 6:
+                    queryWrapper.eq("check_result",1);
+                    break;
                 case 7:
                     queryWrapper.eq("check_in",1);
                     break;
-                case 6:
-                    queryWrapper.eq("check_result",1);
+                case 8:
+                    queryWrapper.ge("register_deadline", now);
+                    queryWrapper.ge("end_time", now);
                     break;
             }
         }
@@ -668,8 +672,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         String meetingSignUpType = request.getParameter("meetingSignUpType");
         if (Objects.equals(meetingSignUpType, 1 + "")) {
             //queryWrapper.ne("pms.company_contact_id",contactId);
-            queryWrapper.ge("date_format(register_deadline,'%Y-%m-%d')", now);
-            queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
+            queryWrapper.ge("register_deadline", now);
+            queryWrapper.ge("end_time", now);
             queryWrapper.and(
                             b -> b.eq("pm.meeting_type",MeetingCommon.STANDARD_MEETING)
                                     .or()