From cb50dbf2778a0638c557174783017a86d33959ae Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 24 Aug 2020 15:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=201?= =?UTF-8?q?=E3=80=81=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=8A=A0=E5=85=AC=E7=9B=8A?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5=202=E3=80=81=E5=BF=97?= =?UTF-8?q?=E5=8F=8B=E6=9C=B5=E6=9C=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=B5=E7=A7=B0=E6=A3=80=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=203=E3=80=81=E5=85=9A=E7=BE=A41+1=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPartyGroupController.java | 30 +++++++++ .../epdc/feign/PartyGroupFeignClient.java | 22 +++++++ .../PartyGroupFeignClientFallback.java | 11 ++++ .../esua/epdc/service/PartyGroupService.java | 20 ++++++ .../service/impl/PartyGroupServiceImpl.java | 10 +++ .../elink/esua/epdc/activity/ActInfoDTO.java | 5 ++ .../activity/entity/ActInfoEntity.java | 5 ++ .../impl/ActUserClockLogServiceImpl.java | 3 +- .../elink/esua/epdc/dto/PartyTopicDTO.java | 20 ++++++ .../dto/form/PartyTopicShieldFormDTO.java | 41 ++++++++++++ .../dto/result/PartyTopicDetailResultDTO.java | 62 +++++++++++++++++++ .../elink/esua/epdc/dto/result/TopicList.java | 10 +++ .../controller/AppPartyTopicController.java | 34 ++++++++-- .../elink/esua/epdc/dao/PartyTopicDao.java | 11 ++++ .../esua/epdc/entity/PartyTopicEntity.java | 20 ++++++ .../esua/epdc/service/PartyTopicService.java | 26 ++++++-- .../service/impl/PartyTopicServiceImpl.java | 20 ++++-- .../main/resources/mapper/PartyTopicDao.xml | 40 ++++++++++++ .../form/EpdcAppVolunteerListFormDTO.java | 5 ++ .../resources/mapper/VolunteerInfoDao.xml | 3 + 20 files changed, 385 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyTopicShieldFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyTopicDetailResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java index 22c50ea6..888962cd 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.service.PartyGroupService; @@ -173,4 +174,33 @@ public class ApiPartyGroupController { return partyGroupService.getGuideInfo(partyGroupId); } + /** + * 屏蔽话题 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 13:38 + */ + @PostMapping("shield") + public Result shieldTopic(@LoginUser TokenDto userDetail, @RequestBody PartyTopicShieldFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + formDto.setShieldUserId(userDetail.getUserId()); + formDto.setShieldUserName(userDetail.getNickname()); + return partyGroupService.shieldTopic(formDto); + } + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 14:35 + */ + @GetMapping("detail/{id}") + public Result topicDetail(@PathVariable("id") String id) { + return partyGroupService.getTopicDetailById(id); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java index 4df0afee..e570d3ac 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java @@ -151,4 +151,26 @@ public interface PartyGroupFeignClient { **/ @GetMapping(value = "partyGroup/epdc-app/partygroupguide/group/guideInfo/{partyGroupId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getGuideInfo(@PathVariable("partyGroupId") String partyGroupId); + + /** + * 屏蔽话题 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 13:55 + */ + @PostMapping(value = "partyGroup/topic/shield", consumes = MediaType.APPLICATION_JSON_VALUE) + Result shieldTopic(PartyTopicShieldFormDTO formDto); + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 14:50 + */ + @GetMapping(value = "partyGroup/topic/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getTopicDetailById(@PathVariable("id") String id); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java index e948313d..2aa76bbf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.PartyGroupFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -87,4 +88,14 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient { public Result> getGuideInfo(String partyGroupId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getGuideInfo",partyGroupId); } + + @Override + public Result shieldTopic(PartyTopicShieldFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "shieldTopic",formDto); + } + + @Override + public Result getTopicDetailById(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getTopicDetailById",id); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java index 654f2c44..6f648e9a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java @@ -119,4 +119,24 @@ public interface PartyGroupService { * @Date 13:48 2020-06-17 **/ Result> getGuideInfo(String partyGroupId); + + /** + * 屏蔽话题 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 13:40 + */ + Result shieldTopic(PartyTopicShieldFormDTO formDto); + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 14:48 + */ + Result getTopicDetailById(String id); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index 5a8bbcbc..9b501eb5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java @@ -157,4 +157,14 @@ public class PartyGroupServiceImpl implements PartyGroupService { public Result> getGuideInfo(String partyGroupId) { return partyGroupFeignClient.getGuideInfo(partyGroupId); } + + @Override + public Result shieldTopic(PartyTopicShieldFormDTO formDto) { + return partyGroupFeignClient.shieldTopic(formDto); + } + + @Override + public Result getTopicDetailById(String id) { + return partyGroupFeignClient.getTopicDetailById(id); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java index 9956ae7d..2dfe2392 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java @@ -224,4 +224,9 @@ public class ActInfoDTO implements Serializable { *是否提交为内容待审核状态 */ private Boolean isConReview; + + /** + * 公益时长 + */ + private Integer kindnessTime; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java index 1a19f9f3..f76f2b29 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java @@ -205,4 +205,9 @@ public class ActInfoEntity extends BaseEpdcEntity { * 活动新闻稿 */ private String actNewsContent; + + /** + * 公益时长 + */ + private Integer kindnessTime; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index d28a2c6f..41dd6307 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java @@ -64,6 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; /** @@ -410,7 +411,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl images; + + /** + * 屏蔽标识：0-否，1-是 + */ + private String shieldFlag; + + /** + * 屏蔽原因 + */ + private String shieldReason; +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java index 513ce52c..49bef853 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java @@ -106,6 +106,16 @@ public class TopicList implements Serializable { */ private String thisCommunity; + /** + * 屏蔽标识：0-否，1-是 + */ + private String shieldFlag; + + /** + * 屏蔽原因 + */ + private String shieldReason; + /** * 评论列表 */ diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java index 324397f4..e6ef0ea9 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java @@ -19,10 +19,8 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO; -import com.elink.esua.epdc.dto.form.TopicStatementFormDTO; +import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO; import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; import com.elink.esua.epdc.service.PartyTopicService; import org.springframework.beans.factory.annotation.Autowired; @@ -89,4 +87,32 @@ public class AppPartyTopicController { return new Result(); } + /** + * 屏蔽话题 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 13:38 + */ + @PostMapping("shield") + public Result shieldTopic(@RequestBody PartyTopicShieldFormDTO formDto) { + return partyTopicService.shieldTopic(formDto); + } + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 14:35 + */ + @GetMapping("detail/{id}") + public Result topicDetail(@PathVariable("id") String id) { + PartyTopicDetailResultDTO data = partyTopicService.getTopicDetailById(id); + + return new Result().ok(data); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java index 70fe5d9b..c15b5794 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PartyTopicDTO; import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO; import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; +import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO; import com.elink.esua.epdc.dto.result.TopicList; import com.elink.esua.epdc.entity.PartyTopicEntity; import org.apache.ibatis.annotations.Mapper; @@ -96,4 +97,14 @@ public interface PartyTopicDao extends BaseDao { * @return void */ void rejectTopicInfo(@Param("relationId") String relationId); + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO + * @author Liuchuang + * @since 2020/8/24 14:32 + */ + PartyTopicDetailResultDTO selectOneOfTopicDetailById(@Param("id") String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java index cdfeadba..c6bca55f 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java @@ -149,4 +149,24 @@ public class PartyTopicEntity extends BaseEpdcEntity { */ private String remark; + /** + * 屏蔽标识：0-否，1-是 + */ + private String shieldFlag; + + /** + * 屏蔽原因 + */ + private String shieldReason; + + /** + * 屏蔽人ID + */ + private String shieldUserId; + + /** + * 屏蔽人 + */ + private String shieldUserName; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java index da85313c..f81879c4 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java @@ -22,10 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO; import com.elink.esua.epdc.dto.PartyTopicDTO; -import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO; -import com.elink.esua.epdc.dto.form.TopicStatementFormDTO; +import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO; import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; import com.elink.esua.epdc.entity.PartyTopicEntity; import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO; @@ -172,4 +170,24 @@ public interface PartyTopicService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result rejectTopicInfo(RejectRecordDTO dto); + + /** + * 屏蔽话题 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/8/24 13:40 + */ + Result shieldTopic(PartyTopicShieldFormDTO formDto); + + /** + * 话题详情 + * + * @param id 话题ID + * @return com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO + * @author Liuchuang + * @since 2020/8/24 14:33 + */ + PartyTopicDetailResultDTO getTopicDetailById(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java index 1c938f33..b112da8d 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java @@ -39,10 +39,8 @@ import com.elink.esua.epdc.dto.PartyTopicDTO; import com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO; import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.dto.constant.PartyGroupConstant; -import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; -import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO; -import com.elink.esua.epdc.dto.form.TopicStatementFormDTO; +import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO; import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; import com.elink.esua.epdc.dto.result.TopicList; import com.elink.esua.epdc.entity.PartyTopicEntity; @@ -312,4 +310,18 @@ public class PartyTopicServiceImpl extends BaseServiceImpl + + @@ -202,6 +204,7 @@ epdc_party_topic t1 WHERE t1.DEL_FLAG = '0' and t1.STATE = '0' + AND t1.SHIELD_FLAG = '0' #{timestamp} @@ -231,6 +234,8 @@ t.SUPPORT_NUM, t.COMMENT_NUM, t.TOPIC_ADDRESS, + t.SHIELD_FLAG, + t.SHIELD_REASON, if( ATTITUDE_FLAG='0',1,0)likeFlag, @@ -279,4 +284,39 @@ UPDATE epdc_party_topic SET DEL_FLAG = 1,UPDATED_TIME=NOW() where id=#{relationId} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java index 5b76ff64..1b27ed97 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java @@ -30,4 +30,9 @@ public class EpdcAppVolunteerListFormDTO { * 数据权限 */ private Long gridId; + + /** + * 搜索条件：昵称 + */ + private String nickname; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 8df20240..07cdce4c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -228,6 +228,9 @@ WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 + + AND v.VOLUNTEER_NICKNAME like concat('%', #{nickname.trim()}, '%') + ORDER BY v.VOLUNTEER_ORDER ASC ,CONVERT(v.VOLUNTEER_NICKNAME USING gbk) LIMIT #{pageIndex},#{pageSize}