From c74410d71e836e2250094ea2279667c234b1a2f2 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Sun, 28 Jun 2020 17:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=89=E5=85=B3=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E6=A0=87=E8=AF=86=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppActInfoController.java | 14 +++ .../epdc/modules/activity/dao/ActInfoDao.java | 15 +++ .../activity/entity/ActInfoEntity.java | 107 +++++++++--------- .../activity/service/ActInfoService.java | 21 +++- .../service/impl/ActInfoServiceImpl.java | 6 + .../resources/mapper/activity/ActInfoDao.xml | 10 +- 6 files changed, 117 insertions(+), 56 deletions(-) diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java index 4ea76f4..274c52a 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java @@ -125,4 +125,18 @@ public class AppActInfoController { return this.actInfoService.getCancelDetailByApp(id); } + /** + * 功能描述: 获取志愿者标识 + * + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2020/6/28 17:01 + */ + @GetMapping("getVolunteerFlag/{actId}") + public Result getVolunteerFlag(@PathVariable String actId) { + ActInfoDTO data = actInfoService.getVolunteerFlag(actId); + return new Result().ok(data); + } + } diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java index bbd6463..d7475ef 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.activity.result.ActInfoResultDTO; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -40,6 +41,7 @@ import java.util.Map; public interface ActInfoDao extends BaseDao { /** * 活动列表 + * * @Params: [params] * @Return: java.util.List * @Author: liuchuang @@ -49,14 +51,17 @@ public interface ActInfoDao extends BaseDao { /** * 移动端-活动列表 + * * @Params: [formDto] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/9 16:50 */ List listItemsByApp(ActInfoAppFormDTO formDto); + /** * 移动端-活动列表（已报名） + * * @Params: [formDto] * @Return: java.util.List * @Author: liuchuang @@ -66,6 +71,7 @@ public interface ActInfoDao extends BaseDao { /** * 工作端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO * @Author: lipengfei @@ -104,6 +110,15 @@ public interface ActInfoDao extends BaseDao { **/ void addClockNum(String actId); + /** + * 功能描述: 查询活动的志愿者标志 + * + * @param actId + * @return ActInfoEntity + * @author zhy + * @date 2020/6/28 16:55 + */ + ActInfoEntity selectActVolunteerFlag(@Param("actId") String actId); /*** * 报名审核不通过 活动报名数-1 diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java index 68e6cc8..cc01d61 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java @@ -33,173 +33,178 @@ import java.util.Date; * @since v1.0.0 2019-12-11 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_act_info") public class ActInfoEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * 标题 */ - private String title; + private String title; /** * 活动头图 */ - private String headPic; + private String headPic; /** * 报名开始时间 */ - private Date signupStartTime; + private Date signupStartTime; /** * 报名截止时间 */ - private Date signupEndTime; + private Date signupEndTime; /** * 活动开始时间 */ - private Date actStartTime; + private Date actStartTime; /** * 活动结束时间 */ - private Date actEndTime; - /** - * 打卡开始时间 - */ - private Date signinStartTime; + private Date actEndTime; + /** + * 打卡开始时间 + */ + private Date signinStartTime; - /** - * 打卡截止时间 - */ - private Date signinEndTime; + /** + * 打卡截止时间 + */ + private Date signinEndTime; - /** + /** * 活动地点 */ - private String actAddress; + private String actAddress; - /** - * 默认状态 - */ - private String actUserDefaultState; + /** + * 默认状态 + */ + private String actUserDefaultState; /** * 活动位置经度 */ - private BigDecimal actLongitude; + private BigDecimal actLongitude; /** * 活动位置纬度 */ - private BigDecimal actLatitude; + private BigDecimal actLatitude; /** * 活动签到打卡地点 */ - private String signinAddress; - /** - * 活动下架原因 - */ - private String cancelReason; + private String signinAddress; + /** + * 活动下架原因 + */ + private String cancelReason; /** * 活动签到打卡位置经度 */ - private BigDecimal signinLongitude; + private BigDecimal signinLongitude; /** * 活动签到打卡位置纬度 */ - private BigDecimal signinLatitude; + private BigDecimal signinLatitude; /** * 活动签到打卡半径(单位：米) */ - private Integer clockRadius; + private Integer clockRadius; /** * 活动名额 */ - private Integer actQuota; + private Integer actQuota; /** * 已报名人数 */ - private Integer signupNum; + private Integer signupNum; /** * 活动打卡人数 */ - private Integer clockNum; + private Integer clockNum; /** * 活动分享数 */ - private Integer actShareNum; + private Integer actShareNum; /** * 活动浏览数 */ - private Integer actBrowseNum; + private Integer actBrowseNum; /** * 联系人 */ - private String contacts; + private String contacts; /** * 联系电话 */ - private String tel; + private String tel; /** * 招募要求 */ - private String requirement; + private String requirement; /** * 活动内容 */ - private String actContent; + private String actContent; /** * 活动发布状态（0-下架，1上架） */ - private String actStatus; + private String actStatus; /** * 活动发布时间 */ - private Date publishTime; + private Date publishTime; /** * 活动主办方 */ - private String sponsor; + private String sponsor; /** * 创建部门ID */ - private Long deptId; + private Long deptId; /** * 活动惩罚积分 */ - private Integer punishmentPoints; + private Integer punishmentPoints; /** * 活动奖励积分 */ - private Integer reward; - /** - * 活动名额类型(0-不限名额，1-固定名额) - */ - private Integer actQuotaCategory; + private Integer reward; + /** + * 活动名额类型(0-不限名额，1-固定名额) + */ + private Integer actQuotaCategory; + + /** + * 是否只允许志愿者参加 0否 1是 + */ + private String volunteerFlag; } diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 09b6563..6ed56a5 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -71,18 +71,31 @@ public interface ActInfoService extends BaseService { */ ActInfoDTO get(String id); + /** + * 查询活动的志愿者标志 + * + * @param actId + * @return ActInfoDTO + * @author zhy + * @date 2020-6-28 + */ + ActInfoDTO getVolunteerFlag(String actId); + /** * 活动列表-移动app端用 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ Result> listItemsByApp(ActInfoAppFormDTO formDto); + /** * 活动列表(已报名)-移动app端用 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -120,6 +133,7 @@ public interface ActInfoService extends BaseService { /** * 移动端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -148,11 +162,10 @@ public interface ActInfoService extends BaseService { void update(ActInfoDTO dto); /** - * * 取消活动 * - * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [dto] * @author liuchuang * @since 2020/2/6 21:18 */ diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 404954d..37f28de 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -123,6 +123,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl + @@ -469,7 +470,14 @@ id = #{actId} AND DEL_FLAG = 0 - + +