liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-06-28 15:58:39 +08:00
parent 6cbc01341e e28d71f140
commit 71bfd5f582
8 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java
View File

@ -41,13 +41,7 @@ public class PartyMemberEventController {
@ApiOperation("活动风采轮播列表")
@GetMapping("/eventStyle/banner")
public BaseResponse<List<EventStyle>> getEventStyleBanner() {
return BaseResponse.success(eventStyleService.getEventStyle("banner",""));
}
@ApiOperation("活动风采列表")
@PostMapping("/eventStyle/list")
public BaseResponse<List<EventStyle>> 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<List<EventSubject>> 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<List<EventPartyBranch>> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param", required = false) String param) {
return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(belongBranch, param));
public BaseResponse<List<EventPartyBranch>> getPartyMemberListByParam(@RequestBody EventQueryInVO inVO){
return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(inVO));
}
@ApiOperation("活动课题列表")
@PostMapping("/eventSubject/list")
public BaseResponse<List<EventSubject>> getEventSubjectList(@RequestBody EventQueryInVO inVO) {
return BaseResponse.success(eventSubjectService.getEventSubjectList(inVO));
}
@ApiOperation("活动风采列表")
@PostMapping("/eventStyle/list")
public BaseResponse<List<EventStyle>> getEventStyleList(@RequestBody EventQueryInVO inVO) {
return BaseResponse.success(eventStyleService.getEventStyle("list", inVO));
}
}

34
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java Normal file
View File

@ -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;
}

3
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java
View File

@ -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<EventPartyBranch>{
List<EventPartyBranch> getPartyMemberList(String belongBranch);
List<EventPartyBranch> getPartyMemberListByParam(String belongBranch, String param);
List<EventPartyBranch> getPartyMemberListByParam(EventQueryInVO inVO);
}

3
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java
View File

@ -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<EventStyle>{
List<EventStyle> getEventStyle(String type, String param);
List<EventStyle> getEventStyle(String type, EventQueryInVO inVO);
}

3
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java
View File

@ -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<EventSubject>{
List<EventSubject> getEventSubjectList(String param);
List<EventSubject> getEventSubjectList(EventQueryInVO inVO);
}

20
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java
View File

@ -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<EventPartyBranchMap
}
@Override
public List<EventPartyBranch> getPartyMemberListByParam(String belongBranch, String param) {
public List<EventPartyBranch> getPartyMemberListByParam(EventQueryInVO inVO) {
LambdaQueryWrapper<EventPartyBranch> 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")

8
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java
View File

@ -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<EventStyleMapper, EventSt
@Override
public List<EventStyle> getEventStyle(String type, String param) {
public List<EventStyle> getEventStyle(String type, EventQueryInVO inVO) {
LambdaQueryWrapper<EventStyle> 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);

8
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java
View File

@ -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<EventSubjectMapper, Eve
private EventContactService contactService;
@Override
public List<EventSubject> getEventSubjectList(String param) {
public List<EventSubject> getEventSubjectList(EventQueryInVO inVO) {
LambdaQueryWrapper<EventSubject> 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<EventSubject> list = this.list(query);
List<String> subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList());
List<String> teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList());