From a0df1d8c97aa62d4b584b4df0ebe6bc1f8ee1a82 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Oct 2021 17:26:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/entity/PayMeetingSituation.java   | 6 ++++++
 .../service/impl/PayMeetingSituationServiceImpl.java        | 1 +
 2 files changed, 7 insertions(+)

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 c6addcd7..3c89c714 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
@@ -242,6 +242,12 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "是否签到")
     @Dict(dicCode = "yn")
     private Integer checkIn;
+    /**
+     * 签到时间
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "签到时间")
+    private java.util.Date checkInTime;
 
     /**签到文件*/
     @ApiModelProperty(value = "签到文件")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index d1a76a26..b545820d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -596,6 +596,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
             meetingSituation.setCheckIn(PayProjectCommon.YES);
             meetingSituation.setCheckFile(signInVO.getFileId());
+            meetingSituation.setCheckInTime(new Date());
             saveOrUpdate(meetingSituation);
         }
         return putDate(payMeeting, meetingSituation);