社区讲坛-报名情况

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<ActivityParticipantEntity> {
-	
+    /**
+     *
+     * 功能描述: 活动参与者
+     *
+     * @param: Map<String, Object>
+     * @return: List<SectionCategoryEntity>
+     * @author: zhy
+     * @date: 2020/6/22 10:01
+     */
+    List<ActivityParticipantEntity> selectListOfActivityParticipant(Map<String, Object> params);
 }

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<ActivityInfoDao, Ac
 
     @Override
     public PageData<ActivityInfoDTO> page(Map<String, Object> params) {
-        IPage<ActivityInfoEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ActivityInfoDTO.class);
+        IPage<ActivityInfoEntity> page = getPage(params);
+        List<ActivityInfoEntity> entityList = baseDao.selectListOfActivityInfo(params);
+        List<ActivityInfoDTO> list = ConvertUtils.sourceToTarget(entityList, ActivityInfoDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override

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<ActivityPart
 
     @Override
     public PageData<ActivityParticipantDTO> page(Map<String, Object> params) {
-        IPage<ActivityParticipantEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ActivityParticipantDTO.class);
+        IPage<ActivityParticipantEntity> page = getPage(params);
+        List<ActivityParticipantEntity> entityList = baseDao.selectListOfActivityParticipant(params);
+        List<ActivityParticipantDTO> list = ConvertUtils.sourceToTarget(entityList, ActivityParticipantDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override

epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml

@@ -40,7 +40,7 @@
     <sql id="Base_Column_List">
         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
     </sql>
@@ -54,6 +54,15 @@
         <if test="title != null and title != ''">
             AND TITLE like CONCAT( '%', #{title}, '%' )
         </if>
+        <if test="actStatus != null and actStatus != ''">
+            AND ACT_STATUS = #{actStatus}
+        </if>
+        <if test="actStartTime != null and actStartTime != ''">
+            AND ACT_START_TIME &gt;= #{actStartTime}
+        </if>
+        <if test="actEndTime != null and actEndTime != ''">
+            AND ACT_END_TIME &lt;= #{actEndTime}
+        </if>
         ORDER BY CREATED_TIME DESC
     </select>
 </mapper>

epdc-cloud-property/src/main/resources/mapper/activity/ActivityParticipantDao.xml

@@ -25,5 +25,30 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
-
+    <sql id="Base_Column_List">
+        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
+    </sql>
+    <select id="selectListOfActivityParticipant" resultType="com.elink.esua.epdc.modules.activity.entity.ActivityParticipantEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_activity_participant a
+        WHERE
+        DEL_FLAG = '0'
+        <if test="realName != null and realName != ''">
+            AND REAL_NAME like CONCAT( '%', #{realName}, '%' )
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND MOBILE like CONCAT( '%', #{mobile}, '%' )
+        </if>
+        <if test="identityNo != null and identityNo != ''">
+            AND IDENTITY_NO like CONCAT( '%', #{identityNo}, '%' )
+        </if>
+        <if test="id != null and id != ''">
+            AND ACT_ID = #{id}
+        </if>
+        ORDER BY CREATED_TIME DESC
+    </select>
 </mapper>