From 1fd0d42a1999b7a9e70418034be77a04bf85ff8d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Jun 2020 17:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=B2=E5=9D=9B-=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/dao/ActivityParticipantDao.java | 14 +++++++++- .../service/impl/ActivityInfoServiceImpl.java | 14 +++++----- .../impl/ActivityParticipantServiceImpl.java | 11 ++++---- .../mapper/activity/ActivityInfoDao.xml | 11 +++++++- .../activity/ActivityParticipantDao.xml | 27 ++++++++++++++++++- 5 files changed, 61 insertions(+), 16 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActivityParticipantDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActivityParticipantDao.java index 46d5fdc..fe72cc9 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActivityParticipantDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActivityParticipantDao.java @@ -21,6 +21,9 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.activity.entity.ActivityParticipantEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 用户活动关系表 * @@ -29,5 +32,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ActivityParticipantDao extends BaseDao { - + /** + * + * 功能描述: 活动参与者 + * + * @param: Map + * @return: List + * @author: zhy + * @date: 2020/6/22 10:01 + */ + List selectListOfActivityParticipant(Map params); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java index 62f2d3d..cd055d1 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.activity.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.activity.dao.ActivityInfoDao; import com.elink.esua.epdc.dto.activity.ActivityInfoDTO; +import com.elink.esua.epdc.modules.activity.dao.ActivityInfoDao; import com.elink.esua.epdc.modules.activity.entity.ActivityInfoEntity; import com.elink.esua.epdc.modules.activity.redis.ActivityInfoRedis; import com.elink.esua.epdc.modules.activity.service.ActivityInfoService; @@ -37,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,11 +57,10 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActivityInfoDTO.class); + IPage page = getPage(params); + List entityList = baseDao.selectListOfActivityInfo(params); + List list = ConvertUtils.sourceToTarget(entityList, ActivityInfoDTO.class); + return new PageData<>(list, page.getTotal()); } @Override diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityParticipantServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityParticipantServiceImpl.java index da3ae75..30c09ae 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityParticipantServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityParticipantServiceImpl.java @@ -23,8 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dto.activity.ActivityInfoDTO; import com.elink.esua.epdc.modules.activity.dao.ActivityParticipantDao; import com.elink.esua.epdc.dto.activity.ActivityParticipantDTO; +import com.elink.esua.epdc.modules.activity.entity.ActivityInfoEntity; import com.elink.esua.epdc.modules.activity.entity.ActivityParticipantEntity; import com.elink.esua.epdc.modules.activity.redis.ActivityParticipantRedis; import com.elink.esua.epdc.modules.activity.service.ActivityParticipantService; @@ -51,11 +53,10 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActivityParticipantDTO.class); + IPage page = getPage(params); + List entityList = baseDao.selectListOfActivityParticipant(params); + List list = ConvertUtils.sourceToTarget(entityList, ActivityParticipantDTO.class); + return new PageData<>(list, page.getTotal()); } @Override diff --git a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml index 37d433f..038432e 100644 --- a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml @@ -40,7 +40,7 @@ ID, TITLE, HEAD_PIC, SECTION_CODE, CATEGORY_CODE, CATEGORY_NAME, SIGN_UP_START_TIME, SIGN_UP_END_TIME, ACT_START_TIME, ACT_END_TIME, ACT_ADDRESS, ACT_LONGITUDE, ACT_LATITUDE, - ACT_QUOTA_FLAG, ACT_QUOTA, SIGN_UP_NUM, CONTACTS, TEL, REQUIREMENT text, ACT_CONTENT text, + ACT_QUOTA_FLAG, ACT_QUOTA, SIGN_UP_NUM, CONTACTS, TEL, REQUIREMENT, ACT_CONTENT, ACT_STATUS, CANCEL_REASON, PUBLISH_TIME, SPONSOR, DEPT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG @@ -54,6 +54,15 @@ AND TITLE like CONCAT( '%', #{title}, '%' ) + + AND ACT_STATUS = #{actStatus} + + + AND ACT_START_TIME >= #{actStartTime} + + + AND ACT_END_TIME <= #{actEndTime} + ORDER BY CREATED_TIME DESC \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityParticipantDao.xml b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityParticipantDao.xml index 2dfb27c..fd256d3 100644 --- a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityParticipantDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityParticipantDao.xml @@ -25,5 +25,30 @@ - + + ID, ACT_ID, USER_ID, NICKNAME, FACE_IMG, PARTY_FLAG, REAL_NAME, SEX, + AGE, MOBILE, IDENTITY_NO, SIGN_UP_TIME, REVISION, + CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG + + \ No newline at end of file