From e28d71f1401d31043293329c0ed504f525c33164 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Tue, 28 Jun 2022 15:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?body=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyMemberEventController.java | 31 +++++++++-------- .../entity/EventQueryInVO.java | 34 +++++++++++++++++++ .../service/EventPartyBranchService.java | 3 +- .../service/EventStyleService.java | 3 +- .../service/EventSubjectService.java | 3 +- .../impl/EventPartyBranchServiceImpl.java | 20 ++++++----- .../service/impl/EventStyleServiceImpl.java | 8 +++-- .../service/impl/EventSubjectServiceImpl.java | 8 +++-- 8 files changed, 80 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index d4930ca..c2aec67 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -41,13 +41,7 @@ public class PartyMemberEventController { @ApiOperation("活动风采轮播列表") @GetMapping("/eventStyle/banner") public BaseResponse> getEventStyleBanner() { - return BaseResponse.success(eventStyleService.getEventStyle("banner","")); - } - - @ApiOperation("活动风采列表") - @PostMapping("/eventStyle/list") - public BaseResponse> getEventStyleList(@RequestParam(value = "param", required = false) String param) { - return BaseResponse.success(eventStyleService.getEventStyle("list", param)); + return BaseResponse.success(eventStyleService.getEventStyle("banner",null)); } @ApiOperation("活动宣言") @@ -56,11 +50,6 @@ public class PartyMemberEventController { return BaseResponse.success(eventPartyBranchService.getEventDeclarationList()); } - @ApiOperation("活动课题列表") - @PostMapping("/eventSubject/list") - public BaseResponse> getEventSubjectList(@RequestParam(value = "param", required = false) String param) { - return BaseResponse.success(eventSubjectService.getEventSubjectList(param)); - } @ApiOperation("活动联系人列表-按公司分组") @GetMapping("/eventContact/group") @@ -103,7 +92,21 @@ public class PartyMemberEventController { @ApiOperation("党员列表模糊查询") @PostMapping("/partyMember/paramQuery") - public BaseResponse> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param", required = false) String param) { - return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(belongBranch, param)); + public BaseResponse> getPartyMemberListByParam(@RequestBody EventQueryInVO inVO){ + return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(inVO)); } + + @ApiOperation("活动课题列表") + @PostMapping("/eventSubject/list") + public BaseResponse> getEventSubjectList(@RequestBody EventQueryInVO inVO) { + return BaseResponse.success(eventSubjectService.getEventSubjectList(inVO)); + } + + + @ApiOperation("活动风采列表") + @PostMapping("/eventStyle/list") + public BaseResponse> getEventStyleList(@RequestBody EventQueryInVO inVO) { + return BaseResponse.success(eventStyleService.getEventStyle("list", inVO)); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java new file mode 100644 index 0000000..23b882c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java @@ -0,0 +1,34 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 EventQueryInVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@Builder +public class EventQueryInVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 数量 + */ + @ApiModelProperty(value = "党支部编码") + private String belongBranch; + + /** + * 名称 + */ + @ApiModelProperty(value = "参数") + private String param; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java index 861ec77..38f1595 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import java.util.List; @@ -23,6 +24,6 @@ public interface EventPartyBranchService extends IService{ List getPartyMemberList(String belongBranch); - List getPartyMemberListByParam(String belongBranch, String param); + List getPartyMemberListByParam(EventQueryInVO inVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java index ff590d4..8c5fd35 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; import java.util.List; @@ -13,5 +14,5 @@ import java.util.List; public interface EventStyleService extends IService{ - List getEventStyle(String type, String param); + List getEventStyle(String type, EventQueryInVO inVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java index d6b897f..f51e13c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; import java.util.List; @@ -13,5 +14,5 @@ import java.util.List; public interface EventSubjectService extends IService{ - List getEventSubjectList(String param); + List getEventSubjectList(EventQueryInVO inVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index bae6d47..8e41995 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -1,12 +1,14 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventPartyBranchMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService; import org.springframework.stereotype.Service; @@ -91,15 +93,17 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getPartyMemberListByParam(String belongBranch, String param) { + public List getPartyMemberListByParam(EventQueryInVO inVO) { LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); - if (StrUtil.isNotBlank(belongBranch)) { - queryMember.eq(EventPartyBranch::getBelongBranch, belongBranch); - } - if (StrUtil.isNotBlank(param)) { - queryMember.and(w -> w.like(EventPartyBranch::getContactName, param) - .or().like(EventPartyBranch::getContactMobiphone, param) - .or().like(EventPartyBranch::getContactEmail, param)); + if (ObjectUtil.isNotNull(inVO)) { + if (StrUtil.isNotBlank(inVO.getBelongBranch())) { + queryMember.eq(EventPartyBranch::getBelongBranch, inVO.getBelongBranch()); + } + if (StrUtil.isNotBlank(inVO.getParam())) { + queryMember.and(w -> w.like(EventPartyBranch::getContactName, inVO.getParam()) + .or().like(EventPartyBranch::getContactMobiphone, inVO.getParam()) + .or().like(EventPartyBranch::getContactEmail, inVO.getParam())); + } } queryMember.eq(EventPartyBranch::getType, "2") diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 48dd96f..8e1d4c7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -1,11 +1,13 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventStyleMapper; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService; import org.springframework.stereotype.Service; @@ -23,10 +25,10 @@ public class EventStyleServiceImpl extends ServiceImpl getEventStyle(String type, String param) { + public List getEventStyle(String type, EventQueryInVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); - if (StrUtil.isNotBlank(param)) { - query.like(EventStyle::getTitle, param); + if (ObjectUtil.isNotNull(inVO) && StrUtil.isNotBlank(inVO.getParam())) { + query.like(EventStyle::getTitle, inVO.getParam()); } if ("banner".equals(type)) { query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java index 0c622db..ce3e2b4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java @@ -1,12 +1,14 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventSubjectMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService; @@ -36,10 +38,12 @@ public class EventSubjectServiceImpl extends ServiceImpl getEventSubjectList(String param) { + public List getEventSubjectList(EventQueryInVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventSubject::getStatus, "1"); - query.like(StrUtil.isNotBlank(param), EventSubject::getTitle, param); + if (ObjectUtil.isNotNull(inVO)) { + query.like(StrUtil.isNotBlank(inVO.getParam()), EventSubject::getTitle, inVO.getParam()); + } List list = this.list(query); List subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList()); List teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList());