From b658fc0c5711b2d91908ce2b1f9927dd1f849629 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 9 Oct 2020 09:09:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9=20?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=8C=89=E9=92=AE=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/resi/ResiActDetailResultDTO.java  | 16 ++++++++++------
 .../epmet/service/impl/ActInfoServiceImpl.java   | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
index 0f5033e02a..4ee734f45e 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
@@ -139,13 +139,17 @@ public class ResiActDetailResultDTO implements Serializable {
     private Boolean isSignUp;
 
     /**
-     * 用户报名活动后，当前状态
-     * --（已报名/待审核auditing，
-     * -- 审核通过passed，
-     * -- 未报名(审核不通过 或 取消报名)canceled，
-     * -- ）
+     * 按钮控制字段(兼容旧版) - true已报名；false未报名
      */
-    private String isRegistration;
+    private Boolean isRegistration;
+
+    /**
+     * 按钮控制字段(新版) -
+     * 已报名/待审核auditing，
+     * 审核通过passed，
+     * 未报名(审核不通过 或 取消报名)canceled
+     */
+    private String userAuditStatus;
 
     /**
      * 打卡开始时间（yyyy-MM-dd HH:mm）
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 4f539675fb..eb2cd42af7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -221,15 +221,24 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
 
         // 查询用户是否已报名活动
         String status = actUserRelationDao.selectUserStatusByActIdAndUserId(formDto.getActId(), formDto.getUserId());
+        // 按钮控制字段 - 兼容旧版本
+        detailResultDTO.setIsRegistration(false);
+        if (null != status){
+            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status) || ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
+                detailResultDTO.setIsRegistration(true);
+            }
+        }
+
+        // 按钮控制字段 - 新版本(为了解决，因为用户未审核通过，却可以打卡的问题)
         // 默认用户 未报名活动
-        detailResultDTO.setIsRegistration(ActConstant.ACT_USER_LOG_OPER_CANCELD);
+        detailResultDTO.setUserAuditStatus(ActConstant.ACT_USER_LOG_OPER_CANCELD);
         if (null != status){
             if (ActConstant.ACT_USER_STATUS_PASSED.equals(status)){
                 // 用户报名活动审核通过，赋值 审核通过
-                detailResultDTO.setIsRegistration(status);
+                detailResultDTO.setUserAuditStatus(status);
             } else if ( ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
                 // 用户报名活动未审核，赋值 已报名/待审核
-                detailResultDTO.setIsRegistration(status);
+                detailResultDTO.setUserAuditStatus(status);
             }
         }
 

From c56c05c1870d195769bc24182dcedc7e850a4e2d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 9 Oct 2020 17:44:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?resi=5Ftopic=E8=A1=A8CLOSED=5FSTATUS?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA=E7=9A=84=E8=AE=BE=E4=B8=8A?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V0.0.3__topic.sql            | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.3__topic.sql

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.3__topic.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.3__topic.sql
new file mode 100644
index 0000000000..f30506fbb6
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.3__topic.sql
@@ -0,0 +1 @@
+UPDATE resi_topic SET CLOSED_STATUS = 'resolved' WHERE CLOSED_STATUS IS NULL
\ No newline at end of file