From ee27ef526fab61b5c9d6fedf1c9052ccd0daa338 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 20 Dec 2021 15:36:18 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=9A=E8=AE=AE=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0signUpStatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      |  3 +-
 .../PayMeetingSituationController.java        | 30 +++++++++++++++++++
 .../meeting/entity/PayMeetingSituation.java   | 13 +++++++-
 .../jero/meeting/mapper/PayMeetingMapper.java |  5 ++--
 .../meeting/mapper/xml/PayMeetingMapper.xml   | 12 ++++++++
 .../meeting/service/IPayMeetingService.java   |  3 ++
 .../PayMeetingRemindRecordServiceImpl.java    |  7 +++--
 .../service/impl/PayMeetingServiceImpl.java   |  5 ++++
 .../com/jero/meeting/vo/PayMeetingVO.java     |  8 +++++
 9 files changed, 80 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 50b8adcb..8eb7c9a0 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
@@ -257,7 +257,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id") String id) {
-        PayMeeting meeting = payMeetingService.queryById(id);
+        Date now = new Date();
+        PayMeeting meeting = payMeetingService.queryByIdAndTime(id,now);
         if (meeting == null) {
             return Result.error("未找到对应数据");
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 27a4fd55..0dc95503 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -214,6 +214,36 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
             return Result.error("未找到对应数据");
         }
         payMeetingSituation.setPhone(PasswordUtil.decrypt(payMeetingSituation.getPhone()));
+        Integer registerCheckResult = payMeetingSituation.getRegisterCheckResult();
+        Integer checkResult = payMeetingSituation.getCheckResult();
+        String paymentRecord = payMeetingSituation.getPaymentRecord();
+        Integer checkIn = payMeetingSituation.getCheckIn();
+        //报名信息审核中：非成员单位需要审核的
+        if (Objects.equals(registerCheckResult, 0)) {
+            payMeetingSituation.setSignUpStatus(1);
+            //    凭证审核中：非成员单位审核通过/不是非成员单位，来款方式为：汇款/线上缴费上传完凭证的；
+        } else if (Objects.equals(registerCheckResult, 1)
+                && StringUtils.isNotBlank(paymentRecord)
+                && Objects.equals(checkResult, 0)) {
+            payMeetingSituation.setSignUpStatus(2);
+            //    不可参会：非成员单位审核拒绝的
+        } else if (Objects.equals(registerCheckResult, 2)) {
+            payMeetingSituation.setSignUpStatus(3);
+            //    待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
+        } else if (Objects.equals(registerCheckResult, 1)
+                && StringUtils.isBlank(paymentRecord)
+                && !Objects.equals(checkResult, 1)) {
+            payMeetingSituation.setSignUpStatus(4);
+            //    凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
+        } else if (Objects.equals(checkResult, 2)) {
+            payMeetingSituation.setSignUpStatus(5);
+            //签到成功的
+        } else if (Objects.equals(checkIn, 1)) {
+            payMeetingSituation.setSignUpStatus(7);
+            //    报名成功：不需要审核直接报名成功的;审核凭证通过的
+        } else if (Objects.equals(checkResult, 1)) {
+            payMeetingSituation.setSignUpStatus(6);
+        }
         return Result.OK(payMeetingSituation);
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 4fdb94cb..67fd85db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -443,5 +443,16 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "报名流程")
     private Integer registerProcess;
 
-
+    /**
+     * 报名信息待审核	1
+     * 凭证待审核	2
+     * 不可参会	3
+     * 待上传凭证	4
+     * 凭证被拒绝	5
+     * 待签到	6
+     * 已签到	7
+     */
+    @TableField(exist = false)
+    @Dict(dicCode = "sign_up_status")
+    private Integer signUpStatus;
 }
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 3bbc7147..3df90a74 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
@@ -19,8 +19,8 @@ import java.util.Date;
 public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
 
     IPage<PayMeeting> pageListContract(Page<PayMeeting> page,
-                                        @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
-                                        @Param("now") Date now);
+                                       @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
+                                       @Param("now") Date now);
 
     IPage<PayMeeting> pageListContract2(Page<PayMeeting> page,
                                         @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
@@ -38,4 +38,5 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
     IPage<PayMeeting> standardPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
 
 
+    PayMeeting queryByIdAndTime(@Param("id") String id, @Param("now") Date now);
 }
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 3cacf369..d6d2df5b 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
@@ -208,4 +208,16 @@
                      left join tb_member_project tmp on tmp.id = pm.standards_id
                 ${ew.customSqlSegment}
     </select>
+
+    <select id="queryByIdAndTime" resultMap="PayMeetingResultMap">
+        select *,
+            (case
+            when date_format(start_time, '%Y-%m-%d') > #{now} then 2
+            when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
+            and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
+            when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+            END
+            ) as meetingStatus
+        from pay_meeting pm where id = #{id}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
index be447d0e..e7e5c82c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
@@ -11,6 +11,7 @@ import com.jero.meeting.vo.PublishReminderVO;
 import com.jero.meeting.vo.UploadFileVO;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -91,4 +92,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
 	 * @return
 	 */
 	PayMeeting getMeetingBySituationId(String situationId);
+
+    PayMeeting queryByIdAndTime(String id, Date now);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java
index dde0aff4..571c50e1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java
@@ -70,8 +70,11 @@ public class PayMeetingRemindRecordServiceImpl extends ServiceImpl<PayMeetingRem
 	public void addList(List<String> meetingIdList, List<PayMeetingRemindRecord> meetingRemindRecordList) {
 		for (String meetingId : meetingIdList) {
 			for (PayMeetingRemindRecord meetingRemindRecord : meetingRemindRecordList) {
-				meetingRemindRecord.setMeetingId(meetingId);
-				save(meetingRemindRecord);
+				PayMeetingRemindRecord meetingRemindRecord1 = new PayMeetingRemindRecord();
+				meetingRemindRecord1.setSubitemId(meetingRemindRecord.getSubitemId());
+				meetingRemindRecord1.setContactId(meetingRemindRecord.getContactId());
+				meetingRemindRecord1.setMeetingId(meetingId);
+				save(meetingRemindRecord1);
 			}
 		}
 	}
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 31bc3525..e622d977 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
@@ -995,4 +995,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         PayMeeting payMeeting = getById(meetingId);
         return payMeeting;
     }
+
+    @Override
+    public PayMeeting queryByIdAndTime(String id, Date now) {
+        return baseMapper.queryByIdAndTime(id,now);
+    }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index 912cd3d1..347da5c4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -1,6 +1,7 @@
 package com.jero.meeting.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
@@ -277,4 +278,11 @@ public class PayMeetingVO implements Serializable {
     /**会议纪要*/
     @ApiModelProperty(value = "会议纪要")
     private String meetingMinute;
+
+    /**
+     * 会议状态 未开始：2 进行中：3 已结束4
+     */
+    @TableField(exist = false)
+    @Dict(dicCode = "meeting_status")
+    private Integer meetingStatus;
 }