From 9f0d8f2b6f8f2afdf66a581759eaed4d542684d1 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 2 Jun 2020 17:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85-=E6=B4=BB=E5=8A=A8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/activity/ActInfoDao.xml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 946d836e..530b433a 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -155,13 +155,14 @@
when = ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1'
else '0' end
when ]]> #{timestamp}
- and #{timestamp}
then '2'
when #{timestamp}
and = ]]> #{timestamp}
then '3'
when #{timestamp}
then '4'
+ WHEN actInfo.ACT_STATUS = '0'
+ THEN '5'
end as actCurrentState,
IF(relation.USER_ID = #{userId},'1','0') as signupFlag
FROM
@@ -170,18 +171,15 @@
and relation.USER_ID = #{userId}
and relation.STATUS not in ('3','4')
and actInfo.ID = relation.ACT_ID
- WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1'
+ WHERE actInfo.DEL_FLAG = '0'
#{timestamp}
AND actInfo.ID = #{actId}
-
- = ]]> #{timestamp}
-
- #{timestamp}
+ #{timestamp}
) temp
ORDER BY temp.actCurrentState ASC