diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java index 34b2b31423..797bade6a4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java @@ -50,7 +50,7 @@ public class ActContentDTO implements Serializable { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java index 10180e0222..3a46608052 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java @@ -238,6 +238,11 @@ public class ActInfoDTO implements Serializable { */ private Boolean summaryFlag; + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + /** * 乐观锁 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java index ef9a3e16e8..59b7ca29c3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java @@ -50,7 +50,7 @@ public class LatestActContentDTO implements Serializable { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java index d4cc64d386..d72ef3b66e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java @@ -179,6 +179,11 @@ public class LatestActInfoDTO implements Serializable { */ private Boolean auditSwitch; + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + /** * 活动类型爱心活动heart 联建活动party */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActPageFormDTO.java new file mode 100644 index 0000000000..1c8b9f501c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActPageFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form.work; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * 爱心互助列表入参DTO + */ +@Data +public class ActPageFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 6473824879249274683L; + /** + * 活动标题 + */ + private String title; + /** + * 活动预计开始时间 + */ + private String actStartTime; + /** + * 活动预计结束时间 + */ + private String actEndTime; + /** + * 状态： 已发布/报名中：published； 已取消：canceled; 已结束：finished） + */ + private String status; + + /** + * tokenDto获取 + */ + private String customerId; + private String userId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index 57e0358505..b63079f849 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -212,4 +212,9 @@ public class PublishActInfoFormDTO implements Serializable { private String serviceMatter; @NotEmpty(message = "服务事项不能为空", groups = {AddPartyActivityGroup.class}) private List serviceMatterList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index 7dfc46329f..13e67231f1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -221,4 +221,9 @@ public class RePublishFormDTO implements Serializable { private String serviceMatter; @NotEmpty(message = "服务事项不能为空", groups = {PublishActInfoFormDTO.AddPartyActivityGroup.class}) private List serviceMatterList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java new file mode 100644 index 0000000000..0f388d686e --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java @@ -0,0 +1,88 @@ +package com.epmet.dto.result.work; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @Author yzm + * @Date 2022/6/30 14:15 + */ +@Data +public class ActPageResDTO implements Serializable { + private static final long serialVersionUID = 5330377961022020364L; + /** + *活动id + */ + private String actId; + + /** + *活动标题 + */ + private String title; + + /** + * 活动地点 + */ + private String actAddress; + + /** + * 活动预计开始时间yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date actStartTime; + + /** + * 活动预计结束时间yyyy-MM-dd HH:mm + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date actEndTime; + /** + * 报名截止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signUpEndTime; + + /** + * 报名开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signUpStartTime; + + /** + * 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough + */ + private String status=""; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + + /** + * true，我发布的，false,其他人发布的 + */ + private Boolean isMyPublish; + + /** + * true:固定名额 false： 不限制名额 + */ + @JsonIgnore + private Boolean actQuotaCategory; + /** + * 活动名额人数 + */ + @JsonIgnore + private Integer actQuota; + + /** + * 已报名人数 + */ + @JsonIgnore + private Integer signedUp; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 1383924f57..985e549bba 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -73,7 +75,12 @@ public class WorkActController { } @PostMapping("publishV2") - public Result publishActV2(@RequestBody PublishActInfoFormDTO formDTO) { + public Result publishActV2(@LoginUser TokenDto tokenDto ,@RequestBody PublishActInfoFormDTO formDTO) { + if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) { + formDTO.setRichTextFlag(true); + } else { + formDTO.setRichTextFlag(false); + } if (ActConstant.HEART.equals(formDTO.getActType())) { ValidatorUtils.validateEntity(formDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class); } else { @@ -276,7 +283,12 @@ public class WorkActController { } @PostMapping("republishV2") - public Result rePublishV2(@RequestBody RePublishFormDTO rePublishFormDTO) { + public Result rePublishV2(@LoginUser TokenDto tokenDto,@RequestBody RePublishFormDTO rePublishFormDTO) { + if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) { + rePublishFormDTO.setRichTextFlag(true); + } else { + rePublishFormDTO.setRichTextFlag(false); + } if (ActConstant.HEART.equals(rePublishFormDTO.getActType())) { ValidatorUtils.validateEntity(rePublishFormDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class); } else { @@ -291,5 +303,17 @@ public class WorkActController { return new Result().ok(workActService.rePublishV2(rePublishFormDTO)); } - + /** + * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("pagelist") + public Result> pageList(@LoginUser TokenDto tokenDto, @RequestBody ActPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + PageData page = workActService.pageList(formDTO); + return new Result>().ok(page); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index 2a1522348e..36e02859a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -24,6 +24,7 @@ import com.epmet.dto.form.resi.ResiActDetailFormDTO; import com.epmet.dto.form.resi.ResiLatestActFormDTO; import com.epmet.dto.form.resi.ResiMyActFormDTO; import com.epmet.dto.form.work.ActListCommonFormDTO; +import com.epmet.dto.form.work.ActPageFormDTO; import com.epmet.dto.result.resi.*; import com.epmet.dto.result.work.*; import com.epmet.entity.ActInfoEntity; @@ -319,4 +320,11 @@ public interface ActInfoDao extends BaseDao { * @return java.util.List */ List selectPublishedAct(@Param("staffId") String staffId); + + /** + * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动 + * @param formDTO + * @return + */ + List pageList(ActPageFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java index 0fea888353..36258239ad 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java @@ -48,7 +48,7 @@ public class ActContentEntity extends BaseEpmetEntity { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java index 191e639b24..ac8ceea745 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java @@ -216,6 +216,11 @@ public class ActInfoEntity extends BaseEpmetEntity { */ private Boolean summaryFlag; + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + /** * 活动类型爱心活动heart 联建活动party */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java index b22c65efed..b05c0cffee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java @@ -48,7 +48,7 @@ public class LatestActContentEntity extends BaseEpmetEntity { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java index 03b679c9c4..4636310442 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java @@ -177,6 +177,12 @@ public class LatestActInfoEntity extends BaseEpmetEntity { * 审核开关：1报名人员需要人工审核0不需要 */ private Boolean auditSwitch; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; + /** * 数据库新增ACT_INFO_ID字段，act_info.id */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java index d470f3571f..244303c84c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java @@ -1,5 +1,6 @@ package com.epmet.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.work.*; import com.epmet.dto.result.work.*; @@ -148,4 +149,11 @@ public interface WorkActService { PublishActResultDTO rePublish(RePublishFormDTO rePublishFormDTO); PublishActResultDTO rePublishV2(RePublishFormDTO rePublishFormDTO); void testGrantPoint(TestGrantFormDTO formDTO); + + /** + * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动 + * @param formDTO + * @return + */ + PageData pageList(ActPageFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 7c4f924e20..8f1ec3e74e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; @@ -35,6 +36,9 @@ import com.epmet.entity.*; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -1621,4 +1625,68 @@ public class WorkActServiceImpl implements WorkActService { }); return content.get(); } + + /** + * @param formDTO + * @return 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动 + */ + @Override + public PageData pageList(ActPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = actInfoDao.pageList(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + Date nowDate = new Date(); + for (ActPageResDTO actPageResDTO : list) { + // 进行中的重新设置状态 + if (ActConstant.ACT_STATUS_PUBLISHED.equals(actPageResDTO.getStatus())) { + // 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough + if (!NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getSignUpEndTime()))) { + logger.info(String.format("当前时间%s报名截止时间%s处于报名中", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(actPageResDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN))); + // 截止报名时间之前(包含报名时间截止时间点) + if (!actPageResDTO.getActQuotaCategory()) { + // 如果是不限制名额，则显示报名中 + actPageResDTO.setStatus("signing_up"); + logger.info("活动不限制名额,界面显示 报名中"); + continue; + } else { + // 固定名额，且已报名人数<活动需要人数显示报名中 + if (actPageResDTO.getActQuota() > actPageResDTO.getSignedUp()) { + logger.info("活动限制名额,未报满,界面显示报名中"); + actPageResDTO.setStatus("signing_up"); + continue; + } else if (actPageResDTO.getActQuota().equals(actPageResDTO.getSignedUp())) { + actPageResDTO.setStatus("enough"); + logger.info("活动限制名额,且已报满,界面显示已报满"); + continue; + } + } + } else if (NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getSignUpEndTime())) + && NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getActStartTime()))) { + logger.info(String.format("当前时间%s报名截止时间%s活动预计开始时间%s界面显示截止报名", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(actPageResDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN), + DateUtils.format(actPageResDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); + // 活动报名截止-活动预计开始之间显示截止报名 + actPageResDTO.setStatus("end_sign_up"); + continue; + } else if (!NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getActStartTime()))) { + logger.info(String.format("当前时间%s活动预计开始时间%s界面显示已开始", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(actPageResDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); + // 活动预计开始时间点之后，包含活动预计开始时间点，显示 已开始 + actPageResDTO.setStatus("in_progress"); + continue; + } + } + + } + } + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql new file mode 100644 index 0000000000..91fe197874 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql @@ -0,0 +1,6 @@ +alter table act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; +alter table act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; +alter table act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER SUMMARY_FLAG; +alter table latest_act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER AUDIT_SWITCH; +alter table latest_act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; +alter table latest_act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 6aa5b1b477..4aca026874 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -798,4 +798,54 @@ AND ACT_STATUS = 'published' AND CREATED_BY = #{staffId} + + +