From a53ecd0736c945ad1e8df302928e8a223639f628 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 18 May 2020 13:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActUserRelationServiceImpl.java      | 27 +++++++++++++++++++
 .../volunteer/dao/VolunteerRankDao.java       |  7 +++++
 .../impl/VolunteerRankServiceImpl.java        |  1 +
 .../mapper/activity/ActUserRelationDao.xml    |  7 +++--
 .../mapper/volunteer/VolunteerRankDao.xml     |  5 +++-
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 24b24b0..7b086d9 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -454,6 +454,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);
@@ -471,6 +475,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 actUserLog.setOperationType(actUserDefaultState);// 默认状态
                 actUserLog.setOperationTime(new Date());
                 actUserLogDao.insert(actUserLog);
+                // 给用户发送消息通知
+                this.sendNotice(actUserRelationDTO, actUserDefaultState, actInfoDTO);
             }
         } else {
             return new Result().ok("该活动暂时没有未审核的志愿者");
@@ -479,4 +485,25 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         return new Result().ok("该活动对已报名的志愿者自动审核成功");
     }
 
+    /**
+     * 自动审核 定时任务 消息通知
+     */
+    private void sendNotice(ActUserRelationDTO actUserRelationDTO, String actUserDefaultState, ActInfoDTO actInfoDTO) {
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        informationFormDTO.setUserId(actUserRelationDTO.getUserId());
+        informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
+        informationFormDTO.setBusinessId(actUserRelationDTO.getActId());
+        informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle());
+        // 审核不通过
+        if (!NumConstant.ONE_STR.equals(actUserDefaultState)) {
+            informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACT_FAILURE);
+            informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_NOT_PASSED);
+            informationFormDTO.setContent(HeartNoticeConstant.AUTH_NOTICE_SIGN_UP);
+        } else {
+            informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACT_SUCCESS);
+            informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_PASSED);
+            informationFormDTO.setContent(HeartNoticeConstant.AUTH_NOTICE_SIGN_UP);
+        }
+        newsTask.insertUserInformation(informationFormDTO);
+    }
 }
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java
index d56556b..dfb56ac 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java
@@ -38,4 +38,11 @@ public interface VolunteerRankDao extends BaseDao<VolunteerRankEntity> {
      * @return
      */
     List<EpdcVolunteerRankDTO> leaderboard();
+
+    /**
+     * 清空排行数据
+     * @Author
+     * @return
+     */
+    void clearGenerateRankingList();
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
index 5b8434b..da0ee46 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
@@ -123,6 +123,7 @@ public class VolunteerRankServiceImpl extends BaseServiceImpl<VolunteerRankDao,
     @Override
     public Result generateRankingList(List<EpdcGetVolunteerRankDTO> list){
         if(list != null && list.size() > 0){
+            baseDao.clearGenerateRankingList();
             for(int i = 0 ; i < list.size(); i++ ){
                 EpdcGetVolunteerRankDTO epdcGetVolunteerRankDTO = list.get(i);
                 VolunteerRankEntity entity = ConvertUtils.sourceToTarget(epdcGetVolunteerRankDTO, VolunteerRankEntity.class);
diff --git a/epdc-cloud-heart/src/main/resources/mapper/activity/ActUserRelationDao.xml b/epdc-cloud-heart/src/main/resources/mapper/activity/ActUserRelationDao.xml
index 5ea3a72..c6c0b29 100644
--- a/epdc-cloud-heart/src/main/resources/mapper/activity/ActUserRelationDao.xml
+++ b/epdc-cloud-heart/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>
diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
index ad0ac00..85640f1 100644
--- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
+++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerRankDao.xml
@@ -24,11 +24,14 @@
     </resultMap>
 
     <select id="leaderboard" resultType="com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO">
-        select NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
+        select SUBSTR(NICKNAME,LOCATE('-',NICKNAME+1)) AS NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
         from epdc_volunteer_rank
         where GENERATE_DATE = DATE_FORMAT(NOW(),'%Y-%m-%d')
         order by sort
     </select>
 
+    <delete id="clearGenerateRankingList">
+        delete from epdc_volunteer_rank
+    </delete>
 
 </mapper>
\ No newline at end of file