From 8c5680ae28bf3393d75729f9ff59322d4f554156 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 22:51:19 +0800
Subject: [PATCH 1/3] signIn

---
 .../com/epmet/modules/act/dao/ActSignInRecordDao.java |  9 +++++++++
 .../act/service/impl/ActSignInRecordServiceImpl.java  |  5 ++++-
 .../main/resources/mapper/act/ActSignInRecordDao.xml  | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java
index 6e53fe6bef..bbc4f5fd8d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java
@@ -49,4 +49,13 @@ public interface ActSignInRecordDao extends BaseDao<ActSignInRecordEntity> {
      * @return int
      */
     List<ActSignInRecordEntity> selectListByGroupActId(String groupActId);
+
+    /**
+     * 查询当前用户签到记录
+     *
+     * @param groupActId
+     * @param signUserId
+     * @return com.epmet.modules.act.entity.ActSignInRecordEntity
+     */
+    ActSignInRecordEntity queryActSignInRecord(@Param("groupActId") String groupActId, @Param("signUserId")String signUserId);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index 3d6beb6863..956fbe0162 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
@@ -149,8 +149,11 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
     @Override
     public void signIn(SignInFormDTO formDTO) {
         if(queryUserSignInRec(formDTO.getGroupActId(),formDTO.getUserId())){
-            //已经签到无需重复签到
+            //已经签到无需重复签到,更新时间
             log.warn(String.format("当前用户userId=%s,已经签到,groupActId=%s",formDTO.getUserId(),formDTO.getGroupActId()));
+            ActSignInRecordEntity updateEntity=baseDao.queryActSignInRecord(formDTO.getGroupActId(),formDTO.getUserId());
+            updateEntity.setUpdatedTime(new Date());
+            baseDao.updateById(updateEntity);
             return;
         }
         GroupActInfoDTO originalActInfo = groupActInfoService.getGroupActInfoDTO(formDTO.getGroupActId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
index 1c5179723f..f542750348 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
@@ -26,4 +26,15 @@
             acr.DEL_FLAG = '0'
             AND acr.GROUP_ACT_ID = #{groupActId}
     </select>
+
+    <select id="queryActSignInRecord" parameterType="map" resultType="com.epmet.modules.act.entity.ActSignInRecordEntity">
+        SELECT
+            acr.*
+        FROM
+            act_sign_in_record acr
+        WHERE
+            acr.DEL_FLAG = '0'
+            AND acr.GROUP_ACT_ID = #{groupActId}
+            AND acr.SIGN_USER_ID =#{signUserId}
+    </select>
 </mapper>
\ No newline at end of file

From 40d7f3932cc6a108cc036e06503a9e8c67d7215c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 22:53:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0signedInNum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/resi/group/dto/act/result/ActDetailResultDTO.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
index 37507b4009..f75226e850 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
@@ -146,4 +146,8 @@ public class ActDetailResultDTO implements Serializable {
      */
     private Boolean startTimeEditFlag;
 
+    /**
+     * 已签到人数（有人签到自动+1）
+     */
+    private Integer signedInNum;
 }

From 7561788e377b8e67ad35c5efd3201e8d1bee083b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 22:54:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/act/service/impl/GroupActInfoServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 8fa5bfecd6..87629fc787 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -343,6 +343,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             entity.setContentType(GroupActConstant.IMG);
             entity.setCustomerId(customerId);
             entity.setSort(imgSort);
+            list.add(entity);
             imgSort++;
         }
         return list;
@@ -358,6 +359,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             entity.setContentType(GroupActConstant.TEXT);
             entity.setCustomerId(customerId);
             entity.setSort(textSort);
+            list.add(entity);
             textSort++;
         }
         return list;