From 6ba65ab7fd5836aec108805e08a640e802bba55f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 31 Jul 2020 16:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActUserRelationServiceImpl.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
index f8c48c27a5..606727cc67 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
@@ -264,8 +264,12 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             this.insertHeartUserInfo(formDTO, volunteerFlag);
         }
         if (signUp){
-            // 4.插入活动日志表
-            this.insertActUserLog(formDTO);
+            // 4.插入用户参加活动-待审核的活动日志表
+            this.insertActUserLog(formDTO, ActConstant.ACT_USER_LOG_OPER_AUDITING);
+            if (!actInfoDTO.getAuditSwitch()){
+                // 自动审核通过，插入用户参加活动-审核通过的日志信息
+                this.insertActUserLog(formDTO, ActConstant.ACT_USER_LOG_OPER_PASSED);
+            }
         }
         // 5.插入 用户活动关系表
         this.insertActUserRelation(formDTO, actInfoDTO);
@@ -334,15 +338,16 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     /**
      * 每次成功报名活动，都需要插入【用户活动关系日志表】
      * @param formDTO
+     * @param userOperationType  用户审核类型：待审核、通过、不通过、取消
      * @return void
      * @Author zhangyong
      * @Date 09:37 2020-07-28
      **/
-    private void insertActUserLog(ResiActRegistrationFormDTO formDTO){
+    private void insertActUserLog(ResiActRegistrationFormDTO formDTO, String userOperationType){
         ActUserLogEntity userLogEntity = new ActUserLogEntity();
         userLogEntity.setActId(formDTO.getActId());
         userLogEntity.setUserId(formDTO.getUserId());
-        userLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_AUDITING);
+        userLogEntity.setOperationType(userOperationType);
         actUserLogService.insert(userLogEntity);
     }
 
@@ -359,12 +364,14 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         ActUserRelationEntity entity = new ActUserRelationEntity();
         entity.setActId(formDTO.getActId());
         entity.setUserId(formDTO.getUserId());
-        entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
         // 审核开关：1报名人员需要人工审核(true)   0不需要(false)
         if (actInfoDTO.getAuditSwitch()){
+            entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
             entity.setPassedType(ActConstant.PASSEDTYPE_MANUAL);
         } else {
+            entity.setStatus(ActConstant.ACT_USER_STATUS_PASSED);
             entity.setPassedType(ActConstant.PASSEDTYPE_AUTO);
+            entity.setProcessFlag(ActConstant.HANDLED);
             entity.setAuditTime(new Date());
         }
         Integer operationCount = baseDao.selectCountByActIdAndUserId(formDTO.getActId(), formDTO.getUserId());