From b3542382cce50b985614b0b683a149a17ebfb366 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 1 Jul 2022 15:06:08 +0800
Subject: [PATCH] auditSwitch

---
 .../java/com/epmet/dto/result/work/ActPageResDTO.java     | 8 ++++++++
 .../src/main/resources/mapper/ActInfoDao.xml              | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java
index ce729c351b..406198fedf 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java
@@ -1,9 +1,11 @@
 package com.epmet.dto.result.work;
 
+import com.epmet.dto.form.work.PublishActInfoFormDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -94,5 +96,11 @@ public class ActPageResDTO implements Serializable {
      * 活动积分
      */
     private Integer reward;
+
+    /**
+     * 报名审核： true: 需人工审核 false: 无需审核
+     */
+    @NotNull(message = "报名审核方式不能为空", groups = {PublishActInfoFormDTO.AddUserInternalGroup.class})
+    private Boolean auditSwitch;
 }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index a9e6e093a9..3a1358cea8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -836,7 +836,8 @@
                 AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' )
             ) AS signedUp,
             ai.SUMMARY_FLAG as summaryFlag,
-            ai.REWARD as reward
+            ai.REWARD as reward,
+            ai.AUDIT_SWITCH as auditSwitch
         FROM
             act_info ai
         WHERE