From 4bc7401094fbe201354aae23ea0bcbf4f1ddd67b Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 22 Jun 2022 17:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyMemberEventController.java | 85 +++++++++++++++++-- .../dao/mapper/EventSubjectTimeMapper.xml | 2 - .../entity/EventPartyBranch.java | 6 ++ .../partyMemberEvent/entity/EventSubject.java | 20 +++++ .../entity/EventSubjectTime.java | 17 ---- .../service/EventContactService.java | 7 ++ .../EventContactSuggestionService.java | 1 + .../service/EventPartyBranchService.java | 12 +++ .../service/EventStyleService.java | 2 +- .../service/EventSubjectService.java | 4 +- .../service/impl/EventContactServiceImpl.java | 24 +++++- .../EventContactSuggestionServiceImpl.java | 19 +++++ .../impl/EventPartyBranchServiceImpl.java | 74 +++++++++++++++- .../service/impl/EventStyleServiceImpl.java | 11 ++- .../service/impl/EventSubjectServiceImpl.java | 62 +++++++++++++- 15 files changed, 308 insertions(+), 38 deletions(-) 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 35ec091..1027ada 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 @@ -2,18 +2,16 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.*; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.Map; @RestController @Api(tags = "党员活动接口") @@ -24,6 +22,14 @@ public class PartyMemberEventController { private EventMockDataService eventMockDataService; @Resource private EventStyleService eventStyleService; + @Resource + private EventPartyBranchService eventPartyBranchService; + @Resource + private EventSubjectService eventSubjectService; + @Resource + private EventContactService eventContactService; + @Resource + private EventContactSuggestionService eventContactSuggestionService; @ApiOperation("右侧专业线数据") @@ -35,6 +41,69 @@ public class PartyMemberEventController { @ApiOperation("活动风采轮播列表") @GetMapping("/eventStyle/banner") public BaseResponse> getEventStyleBanner() { - return BaseResponse.success(eventStyleService.getEventStyleBanner()); + return BaseResponse.success(eventStyleService.getEventStyle("banner")); + } + + @ApiOperation("活动风采列表") + @GetMapping("/eventStyle/list") + public BaseResponse> getEventStyleList() { + return BaseResponse.success(eventStyleService.getEventStyle("list")); + } + + @ApiOperation("活动宣言") + @GetMapping("/eventDeclaration/list") + public BaseResponse> getEventDeclarationList() { + return BaseResponse.success(eventPartyBranchService.getEventDeclarationList()); + } + + @ApiOperation("活动课题列表") + @GetMapping("/eventSubject/list") + public BaseResponse> getEventSubjectList() { + return BaseResponse.success(eventSubjectService.getEventSubjectList()); + } + + @ApiOperation("活动联系人列表-按公司分组") + @GetMapping("/eventContact/group") + public BaseResponse>> getEventContactGroup() { + return BaseResponse.success(eventContactService.getEventContactGroup()); + } + + @ApiOperation("活动联系人列表") + @GetMapping("/eventContact/list") + public BaseResponse> getEventContactList() { + return BaseResponse.success(eventContactService.getEventContactList()); + } + + @ApiOperation("我要提意见") + @PostMapping("/submitSuggestion") + public BaseResponse submitSuggestion(@ApiParam(value = "对象数据", required = true) @RequestBody EventContactSuggestion suggestion) { + return BaseResponse.success(eventContactSuggestionService.submitSuggestion(suggestion)); + } + + + @ApiOperation("党员数量、党支部数量") + @GetMapping("/partyBranchMember/count") + public BaseResponse> getPartyBranchMemberCount() { + return BaseResponse.success(eventPartyBranchService.getPartyBranchMemberCount()); + } + + + @ApiOperation("党支部列表") + @GetMapping("/partyBranch/list") + public BaseResponse> getPartyBranchList() { + return BaseResponse.success(eventPartyBranchService.getPartyBranchList()); + } + + @ApiOperation("党支部下党员列表") + @GetMapping("/partyMember/list") + public BaseResponse> getPartyMemberList(@RequestParam(value = "belongBranch") String belongBranch) { + return BaseResponse.success(eventPartyBranchService.getPartyMemberList(belongBranch)); + } + + + @ApiOperation("党员列表模糊查询") + @GetMapping("/partyMember/paramQuery") + public BaseResponse> getPartyMemberListByParam(@RequestParam(value = "belongBranch") String belongBranch, @RequestParam(value = "param") String param) { + return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(belongBranch, param)); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectTimeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectTimeMapper.xml index 0f3e18d..0b1b83e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectTimeMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectTimeMapper.xml @@ -11,8 +11,6 @@ - - diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java index fe2f308..fbd9fb6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java @@ -155,4 +155,10 @@ public class EventPartyBranch implements Serializable { private String status; + /** + * 党员数量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "党员数量") + private Integer count; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubject.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubject.java index d02d995..0c6cb67 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubject.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubject.java @@ -11,6 +11,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.List; /** * 实体类 EventSubject @@ -133,5 +134,24 @@ public class EventSubject implements Serializable { @ApiModelProperty(value = "需要集团公司提供的供应链平台开发及运营支撑资源(若有)") private String supportResources; + /** + * 团队牵头人信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "团队牵头人信息") + private EventContact teamLeaderInfo; + /** + * 相关人员信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "相关人员信息") + private List teamMenberInfo; + + /** + * 项目推进计划及成果目标 + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目推进计划及成果目标") + private List subjectTimeList; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubjectTime.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubjectTime.java index 2ad1762..e23e32c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubjectTime.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventSubjectTime.java @@ -70,23 +70,6 @@ public class EventSubjectTime implements Serializable { @ApiModelProperty(value = "页面显示状态 0-隐藏 1-显示") private String status; - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) - private java.time.LocalDateTime createTime; - - /** - * 发布时间 - */ - @ApiModelProperty(value = "发布时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) - private java.time.LocalDateTime sendTime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java index b64c5b8..9ba9397 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java @@ -3,6 +3,9 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import java.util.List; +import java.util.Map; + /** * 对数据表 event_contact 操作的 service * @author Auto create @@ -12,4 +15,8 @@ public interface EventContactService extends IService{ + Map> getEventContactGroup(); + + List getEventContactList(); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactSuggestionService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactSuggestionService.java index dab781b..e8ff99a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactSuggestionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactSuggestionService.java @@ -11,5 +11,6 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContactSugg public interface EventContactSuggestionService extends IService{ + Boolean submitSuggestion(EventContactSuggestion suggestion); } 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 4df8cbc..f363c5f 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 @@ -3,6 +3,9 @@ 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 java.util.List; +import java.util.Map; + /** * 对数据表 event_party_branch 操作的 service * @author Auto create @@ -11,5 +14,14 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch public interface EventPartyBranchService extends IService{ + List getEventDeclarationList(); + + Map getPartyBranchMemberCount(); + + List getPartyBranchList(); + + List getPartyMemberList(String belongBranch); + + List getPartyMemberListByParam(String belongBranch, String param); } 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 7fff345..fb4ac76 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 @@ -13,5 +13,5 @@ import java.util.List; public interface EventStyleService extends IService{ - List getEventStyleBanner(); + List getEventStyle(String type); } 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 1c5fd5d..004671d 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 @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; +import java.util.List; + /** * 对数据表 event_subject 操作的 service * @author Auto create @@ -11,5 +13,5 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; public interface EventSubjectService extends IService{ - + List getEventSubjectList(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index 14164ed..6baf960 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -1,11 +1,18 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +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.EventContactMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 对数据表 event_contact 操作的 serviceImpl * @author Auto create @@ -15,4 +22,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class EventContactServiceImpl extends ServiceImpl implements EventContactService { + @Override + public Map> getEventContactGroup() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(EventContact::getStatus, "1"); + return this.list(query).stream().collect(Collectors.groupingBy(EventContact::getContactUnit)); + } + + @Override + public List getEventContactList() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(EventContact::getStatus, "1"); + return this.list(query); + } + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java index 743d0f5..d8d923e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java @@ -1,11 +1,18 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventContactSuggestionMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContactSuggestion; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactSuggestionService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.time.LocalDateTime; + /** * 对数据表 event_contact_suggestion 操作的 serviceImpl * @author Auto create @@ -14,5 +21,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class EventContactSuggestionServiceImpl extends ServiceImpl implements EventContactSuggestionService { + @Resource + private IBaseCacheUserService iBaseCacheUserService; + @Override + public Boolean submitSuggestion(EventContactSuggestion suggestion) { + BaseCacheUser cacheUser = iBaseCacheUserService.getCacheUser(); + suggestion.setId(PropertyUtils.getSnowflakeId()); + suggestion.setSuggestionSponsor(cacheUser.getFullName()); + suggestion.setSuggestionSponsorId(cacheUser.getUserId()); + suggestion.setSuggestionSponsorUnit(cacheUser.getOrganizationId()); + suggestion.setCreateTime(LocalDateTime.now()); + return this.save(suggestion); + } } 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 e61bfdd..e6d4c4e 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,11 +1,17 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +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.service.EventPartyBranchService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; +import java.util.stream.Collectors; + /** * 对数据表 event_party_branch 操作的 serviceImpl * @author Auto create @@ -15,4 +21,70 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class EventPartyBranchServiceImpl extends ServiceImpl implements EventPartyBranchService { + @Override + public List getEventDeclarationList() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").isNotNull(EventPartyBranch::getEventDeclaration); + List list = this.list(); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List returnList = new ArrayList<>(); + list.forEach(f -> returnList.add(f.getContactName() + ":" + f.getEventDeclaration())); + return returnList; + } + + @Override + public Map getPartyBranchMemberCount() { + Map map = new HashMap<>(2); + LambdaQueryWrapper queryBranch = Wrappers.lambdaQuery(); + queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1"); + int branchCount = this.count(queryBranch); + + LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); + queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1"); + int memberCount = this.count(queryMember); + + map.put("branch", branchCount); + map.put("member", memberCount); + + return map; + } + + @Override + public List getPartyBranchList() { + LambdaQueryWrapper queryBranch = Wrappers.lambdaQuery(); + queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1"); + List list = this.list(queryBranch); + + LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); + queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1"); + List memberList = this.list(queryMember); + Map> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranch)); + + list.forEach(f -> f.setCount(listMap.get(f.getBelongBranch()).size())); + + return list.stream().sorted(Comparator.comparing(EventPartyBranch::getCount).reversed()).collect(Collectors.toList()); + } + + @Override + public List getPartyMemberList(String belongBranch) { + LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); + queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").eq(EventPartyBranch::getBelongBranch, belongBranch); + return this.list(queryMember); + } + + @Override + public List getPartyMemberListByParam(String belongBranch, String param) { + LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); + queryMember.eq(EventPartyBranch::getType, "2") + .eq(EventPartyBranch::getStatus, "1") + .eq(EventPartyBranch::getBelongBranch, belongBranch) + .like(EventPartyBranch::getContactName,param) + .like(EventPartyBranch::getContactMobiphone,param) + .like(EventPartyBranch::getContactEmail,param); + return this.list(queryMember); + } + + } 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 bd6b838..c08b74b 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 @@ -22,9 +22,14 @@ public class EventStyleServiceImpl extends ServiceImpl getEventStyleBanner() { + public List getEventStyle(String type) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); - return this.list(query); + if ("banner".equals(type)) { + query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); + return this.list(query); + } else { + query.eq(EventStyle::getBanner, "0").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); + return this.list(query); + } } } 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 5732648..4af6632 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,11 +1,26 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventSubjectMapper; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventSubjectService; -import org.springframework.stereotype.Service; +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.EventSubject; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventSubjectService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventSubjectTimeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * 对数据表 event_subject 操作的 serviceImpl * @author Auto create @@ -14,5 +29,44 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class EventSubjectServiceImpl extends ServiceImpl implements EventSubjectService { + @Resource + private EventSubjectTimeService eventSubjectTimeService; + @Resource + private EventContactService contactService; + + @Override + public List getEventSubjectList() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(EventSubject::getStatus, "1"); + 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()); + List teamMemberIdList = new ArrayList<>(); + list.forEach(f -> teamMemberIdList.addAll(Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()))); + + LambdaQueryWrapper querySubjectTime = Wrappers.lambdaQuery(); + querySubjectTime.eq(EventSubjectTime::getStatus, "1").in(EventSubjectTime::getSubjectId, subjectIdList); + List subjectTimeList = eventSubjectTimeService.list(querySubjectTime); + Map> timeMap = subjectTimeList.stream().collect(Collectors.groupingBy(EventSubjectTime::getSubjectId)); + + List eventContacts = contactService.listByIds(teamLeaderIdList); + Map leaderMap = eventContacts.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); + + LambdaQueryWrapper contactLambdaQuery = new LambdaQueryWrapper<>(); + contactLambdaQuery.eq(EventContact::getStatus, "1").in(EventContact::getId, teamMemberIdList.stream().distinct().collect(Collectors.toList())); + List eventContactList = contactService.list(contactLambdaQuery); + Map eventContactMap = eventContactList.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); + list.forEach(f -> { + List contactList = new ArrayList<>(); + List collect = Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()); + collect.forEach(c -> contactList.add(eventContactMap.get(c))); + f.setTeamMenberInfo(contactList); + f.setSubjectTimeList(timeMap.get(f.getId())); + f.setTeamLeaderInfo(leaderMap.get(f.getTeamLeader())); + }); + + return list; + } + }