活动报名自动审核 -取消后不发送消息

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java

@@ -108,6 +108,9 @@ public class ActUserRelationResultDTO implements Serializable {
      * 报名时间
      */
 	private Date signupTime;
-	
+    /**
+     * 活动状态
+     */
+	private String actStatus;
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -462,7 +462,10 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         // 根据actID查询活动开始未审核报名人默认状态
         ActInfoDTO actInfoDTO = actInfoService.get(actId);
         String actUserDefaultState = actInfoDTO.getActUserDefaultState(); // 活动开始未审核报名人默认状态
-
+        //判断活动状态是否下架若下架直接返回
+        if("0".equals(actInfoDTO.getActStatus())){
+            return new Result().ok("该活动已下架");
+        }
         // 查询已报名未审核的志愿者
         List<ActUserRelationDTO> data = baseDao.selectListActUserInfo(actId);
         if (data != null && data.size() > 0) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml

@@ -41,6 +41,7 @@
         <result property="failureReason" column="FAILURE_REASON"/>
         <result property="auditTime" column="AUDIT_TIME"/>
         <result property="signupTime" column="SIGNUP_TIME"/>
+        <result property="actStatus" column="ACT_STATUS"/>
     </resultMap>
 
     <select id="isSignUp" resultType="int" parameterType="String">
@@ -80,11 +81,13 @@
         relation.STATUS,
         relation.FAILURE_REASON,
         relation.AUDIT_TIME,
-        relation.SIGNUP_TIME
+        relation.SIGNUP_TIME,
+        eai.ACT_STATUS
         FROM
         epdc_act_user_relation relation
+        left join epdc_act_info eai on eai.ID = relation.ACT_ID
         WHERE
-        relation.DEL_FLAG = '0'
+        relation.DEL_FLAG = '0' and eai.DEL_FLAG='0'
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( relation.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>