From 08116413d8ee920bd019308732bfa121e1d9b8d3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 22:33:46 +0800
Subject: [PATCH 1/2] setSignTime

---
 .../modules/act/service/impl/ActSignInRecordServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 af9d938dfd..e9487dfd6f 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
@@ -109,7 +109,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
             String startTimeStr = formDTO.getSignInStartTime().concat(":00");
             groupActInfoEntity.setSignInStartTime(DateUtils.parse(startTimeStr, DateUtils.DATE_TIME_PATTERN));
             String endTimeStr = formDTO.getSignInEndTime().concat(":00");
-            groupActInfoEntity.setSignInStartTime(DateUtils.parse(endTimeStr, DateUtils.DATE_TIME_PATTERN));
+            groupActInfoEntity.setSignInEndTime(DateUtils.parse(endTimeStr, DateUtils.DATE_TIME_PATTERN));
         } catch (Exception e) {
             throw new RenException("签到起止时间格式错误");
         }

From 55d4b3a51ede475148095c89c845e41da67f2dc0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 22:38:22 +0800
Subject: [PATCH 2/2] querySignRecList

---
 .../modules/act/service/impl/ActSignInRecordServiceImpl.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/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index e9487dfd6f..3d6beb6863 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
@@ -210,6 +210,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
         SignInRecResultDTO resultDTO = new SignInRecResultDTO();
         resultDTO.setSignedInNum(originalActInfo.getSignedInNum());
         resultDTO.setShouldAttend(originalActInfo.getShouldAttend());
+        resultDTO.setList(new ArrayList<>());
         List<ActSignInRecordEntity> list = baseDao.selectListByGroupActId(formDTO.getGroupActId());
         if (!CollectionUtils.isEmpty(list)) {
             //2.调用user服务，查询人员基础数据
@@ -229,6 +230,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
                             signInDetail.setSignInTime(l.getCreatedTime());
                             signInDetail.setSignUserId(l.getSignUserId());
                             signInDetail.setSignUserName(user.getSurname().concat(user.getName()));
+                            signInDetailList.add(signInDetail);
                         }
                     });
                 });