Browse Source

获取最近一次编辑的活动

master
yinzuomei 5 years ago
parent
commit
80eaa25d70
  1. 24
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java
  2. 26
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java
  3. 25
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDraftContentDTOResultDTO.java
  4. 166
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java
  5. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
  6. 12
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java
  7. 11
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java
  8. 22
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java
  9. 22
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java
  10. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java
  11. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActInfoService.java
  12. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java
  13. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
  14. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java
  15. 28
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java
  16. 16
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
  17. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml
  18. 59
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml

24
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java

@ -17,11 +17,11 @@
package com.epmet.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 活动信息
@ -57,12 +57,12 @@ public class ActInfoDTO implements Serializable {
/**
* 报名开始时间
*/
private Date signupStartTime;
private Date signUpStartTime;
/**
* 报名截止时间
*/
private Date signupEndTime;
private Date signUpEndTime;
/**
* 招募要求
@ -97,17 +97,17 @@ public class ActInfoDTO implements Serializable {
/**
* 打卡开始时间
*/
private Date signinStartTime;
private Date signInStartTime;
/**
* 打卡截止时间
*/
private Date signinEndTime;
private Date signInEndTime;
/**
* 活动签到打卡地点
*/
private String signinAddress;
private String signInAddress;
/**
* 活动签到打卡位置经度
@ -117,17 +117,17 @@ public class ActInfoDTO implements Serializable {
/**
* 活动签到打卡位置纬度
*/
private BigDecimal signinLatitude;
private BigDecimal signInLatitude;
/**
* 活动签到打卡半径(单位)
*/
private Integer signinRadius;
private Integer signInRadius;
/**
* 活动名额类型(0-不限名额1-固定名额)
*/
private Integer actQuotaCategory;
private Boolean actQuotaCategory;
/**
* 活动名额
@ -190,12 +190,12 @@ public class ActInfoDTO implements Serializable {
/**
* 身份限制:1只有志愿者才可以参加活动0不限制志愿者身份
*/
private Integer volunteerLimit;
private Boolean volunteerLimit;
/**
* 审核开关1报名人员需要人工审核0不需要
*/
private Integer auditSwitch;
private Boolean auditSwitch;
/**
* 活动实际开始时间

26
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java

@ -17,11 +17,11 @@
package com.epmet.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 最近一次编辑的活动信息
@ -57,12 +57,12 @@ public class LatestActInfoDTO implements Serializable {
/**
* 报名开始时间
*/
private Date signupStartTime;
private Date signUpStartTime;
/**
* 报名截止时间
*/
private Date signupEndTime;
private Date signUpEndTime;
/**
* 招募要求
@ -97,37 +97,37 @@ public class LatestActInfoDTO implements Serializable {
/**
* 打卡开始时间
*/
private Date signinStartTime;
private Date signInStartTime;
/**
* 打卡截止时间
*/
private Date signinEndTime;
private Date signInEndTime;
/**
* 活动签到打卡地点
*/
private String signinAddress;
private String signInAddress;
/**
* 活动签到打卡位置经度
*/
private BigDecimal signinLongitude;
private BigDecimal signInLongitude;
/**
* 活动签到打卡位置纬度
*/
private BigDecimal signinLatitude;
private BigDecimal signInLatitude;
/**
* 活动签到打卡半径(单位)
*/
private Integer signinRadius;
private Integer signInRadius;
/**
* 活动名额类型(0-不限名额1-固定名额)
*/
private Integer actQuotaCategory;
private Boolean actQuotaCategory;
/**
* 活动名额
@ -172,12 +172,12 @@ public class LatestActInfoDTO implements Serializable {
/**
* 身份限制:1只有志愿者才可以参加活动0不限制志愿者身份
*/
private Integer volunteerLimit;
private Boolean volunteerLimit;
/**
* 审核开关1报名人员需要人工审核0不需要
*/
private Integer auditSwitch;
private Boolean auditSwitch;
/**
* 乐观锁

25
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDraftContentDTOResultDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.result.work;
import lombok.Data;
import java.io.Serializable;
/**
* 获取最近一次编辑的活动内容-返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/20 21:58
*/
@Data
public class ActDraftContentDTOResultDTO implements Serializable {
private static final long serialVersionUID = 7937967625440168599L;
/**
* 内容
*/
private String content;
/**
* 内容类型 图片img文字text
*/
private String contentType;
}

166
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java

@ -0,0 +1,166 @@
package com.epmet.dto.result.work;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 获取最近一次编辑的活动-返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/20 21:54
*/
@Data
public class LatestDraftActInfoResultDTO implements Serializable {
private static final long serialVersionUID = 4104775168048712734L;
private String actDraftId;
/**
* 客户id
*/
private String customerId;
/**
* 活动标题
*/
private String title;
/**
* 活动封面
*/
private String coverPic;
/**
* 报名开始时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date signUpStartTime;
/**
* 报名截止时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date signUpEndTime;
/**
* 招募要求
*/
private String requirement;
/**
* 活动预计开始时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date actStartTime;
/**
* 活动预计结束时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date actEndTime;
/**
* 活动地点
*/
private String actAddress;
/**
* 活动位置经度
*/
private BigDecimal actLongitude;
/**
* 活动位置纬度
*/
private BigDecimal actLatitude;
/**
* 签到开始时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date signInStartTime;
/**
* 签到截止时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date signInEndTime;
/**
* 活动签到打卡地点
*/
private String signInAddress;
/**
* 活动签到打卡位置经度
*/
private BigDecimal signInLongitude;
/**
* 活动签到打卡位置纬度
*/
private BigDecimal signInLatitude;
/**
* 活动签到打卡半径(单位)
*/
private Integer signInRadius;
/**
* 活动名额类型(0-不限名额1-固定名额)
*/
private Boolean actQuotaCategory;
/**
* 活动名额
*/
private Integer actQuota;
/**
* 联系人
*/
private String sponsorContacts;
/**
* 联系电话
*/
private String sponsorTel;
/**
* 主办方类型网格主办grid组织主办agency
*/
private String sponsorType;
/**
* 主办方id机关或网格的id
*/
private String sponsorId;
/**
* 活动主办方名称机关或网格的名称
*/
private String sponsorName;
/**
* 活动奖励积分
*/
private Integer reward;
/**
* 身份限制:1只有志愿者才可以参加活动0不限制志愿者身份
*/
private Boolean volunteerLimit;
/**
* 审核开关1报名人员需要人工审核0不需要
*/
private Boolean auditSwitch;
/**
* 活动内容-
*/
private List<ActDraftContentDTOResultDTO> actContentList;
}

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java

@ -2,6 +2,7 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.work.PublishActInitResultDTO;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
import com.epmet.service.WorkActDraftService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -47,4 +48,16 @@ public class WorkActDraftController {
return new Result();
}
/**
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.LatestdraftActInfoResultDTO>
* @param
* @author yinzuomei
* @description 获取最近一次编辑的活动,用户选择继续编辑上次的活动
* @Date 2020/7/20 21:56
**/
@PostMapping("latestdraft")
public Result<LatestDraftActInfoResultDTO> getLatestDraft(){
LatestDraftActInfoResultDTO resultDTO=workActDraftService.getLatestDraft();
return new Result<LatestDraftActInfoResultDTO>().ok(resultDTO);
}
}

12
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java

@ -18,9 +18,12 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
import com.epmet.entity.LatestActContentEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 最近一次编辑的活动内容
*
@ -38,4 +41,13 @@ public interface LatestActContentDao extends BaseDao<LatestActContentEntity> {
* @Date 2020/7/20 18:35
**/
int updateToDelByActId(String actId);
/**
* @return java.util.List<com.epmet.dto.result.work.ActDraftContentDTOResultDTO>
* @param actId
* @author yinzuomei
* @description 根据latest_act_info.id查询活动内容已排序
* @Date 2020/7/20 23:01
**/
List<ActDraftContentDTOResultDTO> selectActContentList(String actId);
}

11
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java

@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
import com.epmet.entity.LatestActInfoEntity;
import org.apache.ibatis.annotations.Mapper;
@ -31,12 +32,20 @@ import org.apache.ibatis.annotations.Mapper;
public interface LatestActInfoDao extends BaseDao<LatestActInfoEntity> {
/**
* @return java.lang.Integer
* @param userId
* @return java.lang.Integer
* @author yinzuomei
* @description 查询当前用户保留的活动记录
* @Date 2020/7/20 18:06
**/
Integer countByUserId(String userId);
/**
* @param userId
* @return com.epmet.dto.result.work.LatestDraftActInfoResultDTO
* @author yinzuomei
* @description 获取用户最近一次编辑的活动信息
* @Date 2020/7/20 23:05
**/
LatestDraftActInfoResultDTO selectLatestActDraft(String userId);
}

22
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java

@ -57,12 +57,12 @@ public class ActInfoEntity extends BaseEpmetEntity {
/**
* 报名开始时间
*/
private Date signupStartTime;
private Date signUpStartTime;
/**
* 报名截止时间
*/
private Date signupEndTime;
private Date signUpEndTime;
/**
* 招募要求
@ -97,32 +97,32 @@ public class ActInfoEntity extends BaseEpmetEntity {
/**
* 打卡开始时间
*/
private Date signinStartTime;
private Date signInStartTime;
/**
* 打卡截止时间
*/
private Date signinEndTime;
private Date signInEndTime;
/**
* 活动签到打卡地点
*/
private String signinAddress;
private String signInAddress;
/**
* 活动签到打卡位置经度
*/
private BigDecimal signinLongitude;
private BigDecimal signInLongitude;
/**
* 活动签到打卡位置纬度
*/
private BigDecimal signinLatitude;
private BigDecimal signInLatitude;
/**
* 活动签到打卡半径(单位)
*/
private Integer signinRadius;
private Integer signInRadius;
/**
* 活动名额类型(0-不限名额1-固定名额)
@ -190,12 +190,12 @@ public class ActInfoEntity extends BaseEpmetEntity {
/**
* 身份限制:1只有志愿者才可以参加活动0不限制志愿者身份
*/
private Integer volunteerLimit;
private Boolean volunteerLimit;
/**
* 审核开关1报名人员需要人工审核0不需要
*/
private Integer auditSwitch;
private Boolean auditSwitch;
/**
* 活动实际开始时间
@ -215,6 +215,6 @@ public class ActInfoEntity extends BaseEpmetEntity {
/**
* 1已经总结0未总结
*/
private Integer summaryFlag;
private Boolean summaryFlag;
}

22
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java

@ -57,12 +57,12 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
/**
* 报名开始时间
*/
private Date signupStartTime;
private Date signUpStartTime;
/**
* 报名截止时间
*/
private Date signupEndTime;
private Date signUpEndTime;
/**
* 招募要求
@ -97,37 +97,37 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
/**
* 打卡开始时间
*/
private Date signinStartTime;
private Date signInStartTime;
/**
* 打卡截止时间
*/
private Date signinEndTime;
private Date signInEndTime;
/**
* 活动签到打卡地点
*/
private String signinAddress;
private String signInAddress;
/**
* 活动签到打卡位置经度
*/
private BigDecimal signinLongitude;
private BigDecimal signInLongitude;
/**
* 活动签到打卡位置纬度
*/
private BigDecimal signinLatitude;
private BigDecimal signInLatitude;
/**
* 活动签到打卡半径(单位)
*/
private Integer signinRadius;
private Integer signInRadius;
/**
* 活动名额类型(0-不限名额1-固定名额)
*/
private Integer actQuotaCategory;
private Boolean actQuotaCategory;
/**
* 活动名额
@ -172,11 +172,11 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
/**
* 身份限制:1只有志愿者才可以参加活动0不限制志愿者身份
*/
private Integer volunteerLimit;
private Boolean volunteerLimit;
/**
* 审核开关1报名人员需要人工审核0不需要
*/
private Integer auditSwitch;
private Boolean auditSwitch;
}

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActContentService.java

@ -20,6 +20,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.LatestActContentDTO;
import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
import com.epmet.entity.LatestActContentEntity;
import java.util.List;
@ -101,4 +102,13 @@ public interface LatestActContentService extends BaseService<LatestActContentEnt
* @Date 2020/7/20 18:34
**/
int deleteByActId(String actId);
/**
* @return java.util.List<com.epmet.dto.result.work.ActDraftContentDTOResultDTO>
* @param actId
* @author yinzuomei
* @description 根据latest_act_info.id查询活动内容已排序
* @Date 2020/7/20 22:59
**/
List<ActDraftContentDTOResultDTO> selectActContentList(String actId);
}

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActInfoService.java

@ -20,6 +20,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.LatestActInfoDTO;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
import com.epmet.entity.LatestActInfoEntity;
import java.util.List;
@ -110,4 +111,13 @@ public interface LatestActInfoService extends BaseService<LatestActInfoEntity> {
* @Date 2020/7/20 18:17
**/
void deleteAllDraft(String userId);
/**
* @return com.epmet.dto.result.work.LatestDraftActInfoResultDTO
* @param userId
* @author yinzuomei
* @description 获取用户最近一次编辑的活动信息
* @Date 2020/7/20 22:59
**/
LatestDraftActInfoResultDTO getLatestActDraft(String userId);
}

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActDraftService.java

@ -1,6 +1,7 @@
package com.epmet.service;
import com.epmet.dto.form.work.PublishActInitResultDTO;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
/**
* 工作端活动草稿
@ -27,4 +28,13 @@ public interface WorkActDraftService {
* @Date 2020/7/20 18:15
**/
void deleteDraft();
/**
* @return com.epmet.dto.result.work.LatestDraftActInfoResultDTO
* @param
* @author yinzuomei
* @description 获取最近一次编辑的活动
* @Date 2020/7/20 22:29
**/
LatestDraftActInfoResultDTO getLatestDraft();
}

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java

@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.LatestActContentDao;
import com.epmet.dto.LatestActContentDTO;
import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
import com.epmet.entity.LatestActContentEntity;
import com.epmet.redis.LatestActContentRedis;
import com.epmet.service.LatestActContentService;
@ -114,4 +115,16 @@ public class LatestActContentServiceImpl extends BaseServiceImpl<LatestActConten
return updateNum;
}
/**
* @param actId
* @return java.util.List<com.epmet.dto.result.work.ActDraftContentDTOResultDTO>
* @author yinzuomei
* @description 根据latest_act_info.id查询活动内容已排序
* @Date 2020/7/20 22:59
**/
@Override
public List<ActDraftContentDTOResultDTO> selectActContentList(String actId) {
return baseDao.selectActContentList(actId);
}
}

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java

@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.LatestActInfoDao;
import com.epmet.dto.LatestActInfoDTO;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
import com.epmet.entity.LatestActInfoEntity;
import com.epmet.redis.LatestActInfoRedis;
import com.epmet.service.LatestActContentService;
@ -138,5 +139,17 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
}
}
/**
* @param userId
* @return com.epmet.dto.result.work.LatestDraftActInfoResultDTO
* @author yinzuomei
* @description 获取用户最近一次编辑的活动信息
* @Date 2020/7/20 22:59
**/
@Override
public LatestDraftActInfoResultDTO getLatestActDraft(String userId) {
return baseDao.selectLatestActDraft(userId);
}
}

28
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@ -2,6 +2,9 @@ package com.epmet.service.impl;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.dto.form.work.PublishActInitResultDTO;
import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
import com.epmet.service.LatestActContentService;
import com.epmet.service.LatestActInfoService;
import com.epmet.service.WorkActDraftService;
import org.apache.commons.lang3.StringUtils;
@ -10,6 +13,8 @@ import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 工作端活动草稿
*
@ -23,6 +28,8 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
private LoginUserUtil loginUserUtil;
@Autowired
private LatestActInfoService latestActInfoService;
@Autowired
private LatestActContentService latestActContentService;
/**
* @return com.epmet.dto.form.work.PublishActInitResultDTO
@ -61,4 +68,25 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
latestActInfoService.deleteAllDraft(currentUserId);
}
}
/**
* @return com.epmet.dto.result.work.LatestDraftActInfoResultDTO
* @author yinzuomei
* @description 获取最近一次编辑的活动
* @Date 2020/7/20 22:29
**/
@Override
public LatestDraftActInfoResultDTO getLatestDraft() {
String userId=loginUserUtil.getLoginUserId();
if(StringUtils.isNotBlank(userId)){
LatestDraftActInfoResultDTO latestAct=latestActInfoService.getLatestActDraft(userId);
if(null!=latestAct){
List<ActDraftContentDTOResultDTO> actContentList=latestActContentService.selectActContentList(latestAct.getActDraftId());
latestAct.setActContentList(actContentList);
}
}else{
logger.warn("loginUserUtil.getLoginUserId()获取当前用户id为空");
}
return null;
}
}

16
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@ -8,20 +8,20 @@
<result property="customerId" column="CUSTOMER_ID"/>
<result property="title" column="TITLE"/>
<result property="coverPic" column="COVER_PIC"/>
<result property="signupStartTime" column="SIGNUP_START_TIME"/>
<result property="signupEndTime" column="SIGNUP_END_TIME"/>
<result property="signUpStartTime" column="SIGNUP_START_TIME"/>
<result property="signUpEndTime" column="SIGNUP_END_TIME"/>
<result property="requirement" column="REQUIREMENT"/>
<result property="actStartTime" column="ACT_START_TIME"/>
<result property="actEndTime" column="ACT_END_TIME"/>
<result property="actAddress" column="ACT_ADDRESS"/>
<result property="actLongitude" column="ACT_LONGITUDE"/>
<result property="actLatitude" column="ACT_LATITUDE"/>
<result property="signinStartTime" column="SIGNIN_START_TIME"/>
<result property="signinEndTime" column="SIGNIN_END_TIME"/>
<result property="signinAddress" column="SIGNIN_ADDRESS"/>
<result property="signinLongitude" column="SIGNIN_LONGITUDE"/>
<result property="signinLatitude" column="SIGNIN_LATITUDE"/>
<result property="signinRadius" column="SIGNIN_RADIUS"/>
<result property="signInStartTime" column="SIGNIN_START_TIME"/>
<result property="signInEndTime" column="SIGNIN_END_TIME"/>
<result property="signInAddress" column="SIGNIN_ADDRESS"/>
<result property="signInLongitude" column="SIGNIN_LONGITUDE"/>
<result property="signInLatitude" column="SIGNIN_LATITUDE"/>
<result property="signInRadius" column="SIGNIN_RADIUS"/>
<result property="actQuotaCategory" column="ACT_QUOTA_CATEGORY"/>
<result property="actQuota" column="ACT_QUOTA"/>
<result property="actStatus" column="ACT_STATUS"/>

13
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml

@ -24,4 +24,17 @@
WHERE
ACT_ID = #{actId}
</update>
<!-- 根据latest_act_info.id查询活动内容,已排序 -->
<select id="selectActContentList" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.ActDraftContentDTOResultDTO">
SELECT
lac.CONTENT,lac.CONTENT_TYPE
FROM
latest_act_content lac
WHERE
lac.DEL_FLAG = '0'
AND lac.ACT_ID = #{actId}
ORDER BY
lac.ORDER_NUM ASC
</select>
</mapper>

59
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml

@ -8,20 +8,20 @@
<result property="customerId" column="CUSTOMER_ID"/>
<result property="title" column="TITLE"/>
<result property="coverPic" column="COVER_PIC"/>
<result property="signupStartTime" column="SIGNUP_START_TIME"/>
<result property="signupEndTime" column="SIGNUP_END_TIME"/>
<result property="signUpStartTime" column="SIGNUP_START_TIME"/>
<result property="signUpEndTime" column="SIGNUP_END_TIME"/>
<result property="requirement" column="REQUIREMENT"/>
<result property="actStartTime" column="ACT_START_TIME"/>
<result property="actEndTime" column="ACT_END_TIME"/>
<result property="actAddress" column="ACT_ADDRESS"/>
<result property="actLongitude" column="ACT_LONGITUDE"/>
<result property="actLatitude" column="ACT_LATITUDE"/>
<result property="signinStartTime" column="SIGNIN_START_TIME"/>
<result property="signinEndTime" column="SIGNIN_END_TIME"/>
<result property="signinAddress" column="SIGNIN_ADDRESS"/>
<result property="signinLongitude" column="SIGNIN_LONGITUDE"/>
<result property="signinLatitude" column="SIGNIN_LATITUDE"/>
<result property="signinRadius" column="SIGNIN_RADIUS"/>
<result property="signInStartTime" column="SIGNIN_START_TIME"/>
<result property="signInEndTime" column="SIGNIN_END_TIME"/>
<result property="signInAddress" column="SIGNIN_ADDRESS"/>
<result property="signInLongitude" column="SIGNIN_LONGITUDE"/>
<result property="signInLatitude" column="SIGNIN_LATITUDE"/>
<result property="signInRadius" column="SIGNIN_RADIUS"/>
<result property="actQuotaCategory" column="ACT_QUOTA_CATEGORY"/>
<result property="actQuota" column="ACT_QUOTA"/>
<result property="sponsorContacts" column="SPONSOR_CONTACTS"/>
@ -52,4 +52,47 @@
AND lai.CREATED_BY = #{userId}
</select>
<resultMap type="com.epmet.dto.result.work.LatestDraftActInfoResultDTO" id="LatestDraftActInfoResultMap">
<result property="actDraftId" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="title" column="TITLE"/>
<result property="coverPic" column="COVER_PIC"/>
<result property="signUpStartTime" column="SIGNUP_START_TIME"/>
<result property="signUpEndTime" column="SIGNUP_END_TIME"/>
<result property="requirement" column="REQUIREMENT"/>
<result property="actStartTime" column="ACT_START_TIME"/>
<result property="actEndTime" column="ACT_END_TIME"/>
<result property="actAddress" column="ACT_ADDRESS"/>
<result property="actLongitude" column="ACT_LONGITUDE"/>
<result property="actLatitude" column="ACT_LATITUDE"/>
<result property="signInStartTime" column="SIGNIN_START_TIME"/>
<result property="signInEndTime" column="SIGNIN_END_TIME"/>
<result property="signInAddress" column="SIGNIN_ADDRESS"/>
<result property="signInLongitude" column="SIGNIN_LONGITUDE"/>
<result property="signInLatitude" column="SIGNIN_LATITUDE"/>
<result property="signInRadius" column="SIGNIN_RADIUS"/>
<result property="actQuotaCategory" column="ACT_QUOTA_CATEGORY"/>
<result property="actQuota" column="ACT_QUOTA"/>
<result property="sponsorContacts" column="SPONSOR_CONTACTS"/>
<result property="sponsorTel" column="SPONSOR_TEL"/>
<result property="sponsorType" column="SPONSOR_TYPE"/>
<result property="sponsorId" column="SPONSOR_ID"/>
<result property="sponsorName" column="SPONSOR_NAME"/>
<result property="reward" column="REWARD"/>
<result property="volunteerLimit" column="VOLUNTEER_LIMIT"/>
<result property="auditSwitch" column="AUDIT_SWITCH"/>
</resultMap>
<!-- 获取用户最近一次编辑的活动信息 -->
<select id="selectLatestActDraft" parameterType="java.lang.String" resultMap="LatestDraftActInfoResultMap">
SELECT
lai.*
FROM
latest_act_info lai
WHERE
lai.DEL_FLAG = '0'
AND lai.CREATED_BY = #{userId}
ORDER BY
lai.CREATED_TIME DESC
LIMIT 1
</select>
</mapper>
Loading…
Cancel
Save