From 4b058ff2e5887720019a7c52bb93333ba9cfc4e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 5 Jan 2022 10:29:10 +0800 Subject: [PATCH] =?UTF-8?q?/resi/act/list/auditing=E6=B7=BB=E5=8A=A0actTyp?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/resi/ResiMyActResultDTO.java | 5 +++++ .../src/main/resources/mapper/ActInfoDao.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiMyActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiMyActResultDTO.java index b477f6d513..5eb0d2b8a4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiMyActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiMyActResultDTO.java @@ -82,4 +82,9 @@ public class ResiMyActResultDTO implements Serializable { * 活动当前状态(审核中auditing，审核通过passed，审核不通过refused，已结束canceld) */ private String actCurrentState; + + /** + * 活动类型 爱心活动heart 联建活动party + */ + private String actType; } 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 56e7dd02d2..e0444a82d3 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 @@ -202,7 +202,8 @@ i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 - 'auditing' AS actCurrentState -- 活动状态 + 'auditing' AS actCurrentState, -- 活动状态 + i.act_type as actType FROM act_user_relation u LEFT JOIN act_info i ON i.ID = u.ACT_ID LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0'