党员活动
This commit is contained in:
@ -0,0 +1,81 @@
|
||||
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.*;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.*;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
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 = "活动运维接口")
|
||||
@RequestMapping("/v1/eventmaintain")
|
||||
public class PartyEventMaintainController {
|
||||
|
||||
@Resource
|
||||
private EventMockDataService eventMockDataService;
|
||||
@Resource
|
||||
private EventStyleService eventStyleService;
|
||||
@Resource
|
||||
private EventPartyBranchService eventPartyBranchService;
|
||||
@Resource
|
||||
private EventSubjectService eventSubjectService;
|
||||
@Resource
|
||||
private EventContactService eventContactService;
|
||||
|
||||
|
||||
|
||||
@ApiOperation("保存联系人")
|
||||
@PostMapping("/save/contact")
|
||||
public BaseResponse<Boolean> saveContact(@RequestBody EventContact inVO) {
|
||||
return BaseResponse.success(eventContactService.saveContact(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("保存攻坚项目")
|
||||
@PostMapping("/save/subject")
|
||||
public BaseResponse<Boolean> saveSubject(@RequestBody EventSubject inVO) {
|
||||
return BaseResponse.success(eventSubjectService.saveSubject(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("保存活动风采")
|
||||
@PostMapping("/save/style")
|
||||
public BaseResponse<Boolean> saveStyle(@RequestBody EventStyle inVO) {
|
||||
return BaseResponse.success(eventStyleService.saveStyle(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("保存党支部")
|
||||
@PostMapping("/save/branch")
|
||||
public BaseResponse<Boolean> saveBranch(@RequestBody EventPartyBranch inVO) {
|
||||
return BaseResponse.success(eventPartyBranchService.saveBranch(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("保存党员")
|
||||
@PostMapping("/save/member")
|
||||
public BaseResponse<Boolean> saveMember(@RequestBody EventPartyBranch inVO) {
|
||||
return BaseResponse.success(eventPartyBranchService.saveMember(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("更新右侧栏数据")
|
||||
@PostMapping("/save/rightData")
|
||||
public BaseResponse<Boolean> saveRightData(@RequestBody List<EventMockData> list) {
|
||||
return BaseResponse.success(eventMockDataService.saveRightData(list));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("查询右侧栏数据")
|
||||
@PostMapping("/query/rightData")
|
||||
public BaseResponse<List<EventMockData>> queryRightData() {
|
||||
return BaseResponse.success(eventMockDataService.list());
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -53,8 +53,8 @@ public class PartyMemberEventController {
|
||||
|
||||
@ApiOperation("活动联系人列表-按公司分组")
|
||||
@GetMapping("/eventContact/group")
|
||||
public BaseResponse<Map<String, List<EventContact>>> getEventContactGroup() {
|
||||
return BaseResponse.success(eventContactService.getEventContactGroup());
|
||||
public BaseResponse<Map<String, List<EventContact>>> getEventContactGroup(@RequestParam(value = "param") String param) {
|
||||
return BaseResponse.success(eventContactService.getEventContactGroup(param));
|
||||
}
|
||||
|
||||
@ApiOperation("活动联系人列表")
|
||||
@ -77,18 +77,23 @@ public class PartyMemberEventController {
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("党支部列表")
|
||||
@ApiOperation("省分列表")
|
||||
@GetMapping("/partyBranch/list")
|
||||
public BaseResponse<List<EventPartyBranch>> getPartyBranchList() {
|
||||
return BaseResponse.success(eventPartyBranchService.getPartyBranchList());
|
||||
}
|
||||
|
||||
@ApiOperation("党支部下党员列表")
|
||||
@ApiOperation("省份下党员列表")
|
||||
@GetMapping("/partyMember/list")
|
||||
public BaseResponse<List<EventPartyBranch>> getPartyMemberList(@RequestParam(value = "belongBranch") String belongBranch) {
|
||||
return BaseResponse.success(eventPartyBranchService.getPartyMemberList(belongBranch));
|
||||
}
|
||||
|
||||
@ApiOperation("省份下党支部列表")
|
||||
@PostMapping("/provinceBranch/list")
|
||||
public BaseResponse<List<EventPartyQueryOutVO>> getProvinceBranchList(@RequestBody(required = false) EventQueryInVO inVO) {
|
||||
return BaseResponse.success(eventPartyBranchService.getProvinceBranchList(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("党员列表模糊查询")
|
||||
@PostMapping("/partyMember/paramQuery")
|
||||
@ -116,31 +121,4 @@ public class PartyMemberEventController {
|
||||
return BaseResponse.success(eventContactService.saveContact(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("保存攻坚项目")
|
||||
@PostMapping("/save/subject")
|
||||
public BaseResponse<Boolean> saveSubject(@RequestBody EventSubject inVO) {
|
||||
return BaseResponse.success(eventSubjectService.saveSubject(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("保存活动风采")
|
||||
@PostMapping("/save/style")
|
||||
public BaseResponse<Boolean> saveStyle(@RequestBody EventStyle inVO) {
|
||||
return BaseResponse.success(eventStyleService.saveStyle(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("保存党支部")
|
||||
@PostMapping("/save/branch")
|
||||
public BaseResponse<Boolean> saveBranch(@RequestBody EventPartyBranch inVO) {
|
||||
return BaseResponse.success(eventPartyBranchService.saveBranch(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("保存党员")
|
||||
@PostMapping("/save/member")
|
||||
public BaseResponse<Boolean> saveMember(@RequestBody EventPartyBranch inVO) {
|
||||
return BaseResponse.success(eventPartyBranchService.saveMember(inVO));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -57,6 +57,18 @@ public class EventContactSuggestion implements Serializable {
|
||||
@ApiModelProperty(value = "意见内容")
|
||||
private String suggestionContent;
|
||||
|
||||
/**
|
||||
* 补充说明
|
||||
*/
|
||||
@ApiModelProperty(value = "补充说明")
|
||||
private String instructions;
|
||||
|
||||
/**
|
||||
* 附件id
|
||||
*/
|
||||
@ApiModelProperty(value = "附件id")
|
||||
private String attachmentImage;
|
||||
|
||||
/**
|
||||
* 意见提出人
|
||||
*/
|
||||
|
@ -0,0 +1,98 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 实体类 EventMaintainInVO
|
||||
*
|
||||
* @auto.generated
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel
|
||||
public class EventMaintainInVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@ApiModelProperty(value = "标题")
|
||||
private String title;
|
||||
|
||||
|
||||
/**
|
||||
* 类别
|
||||
*/
|
||||
@ApiModelProperty(value = "类别 1-首页,2-活动风采,3-攻坚克难")
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 活动内容正文
|
||||
*/
|
||||
@ApiModelProperty(value = "活动内容正文")
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 活动图片
|
||||
*/
|
||||
@ApiModelProperty(value = "活动图片")
|
||||
private String image;
|
||||
|
||||
/**
|
||||
* 显示排序
|
||||
*/
|
||||
@ApiModelProperty(value = "显示排序")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 是否轮播广告:0-否,1-是
|
||||
*/
|
||||
@ApiModelProperty(value = "是否轮播广告:0-否,1-是")
|
||||
private String banner;
|
||||
|
||||
/**
|
||||
* 页面显示状态: 0-隐藏 1-显示
|
||||
*/
|
||||
@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;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@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 endTime;
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 实体类 EventMaintainOutVO
|
||||
*
|
||||
* @auto.generated
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel
|
||||
public class EventMaintainOutVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@ApiModelProperty(value = "标题")
|
||||
private String title;
|
||||
|
||||
|
||||
/**
|
||||
* 类别
|
||||
*/
|
||||
@ApiModelProperty(value = "类别 1-首页,2-活动风采,3-攻坚克难")
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 活动内容正文
|
||||
*/
|
||||
@ApiModelProperty(value = "活动内容正文")
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 活动图片
|
||||
*/
|
||||
@ApiModelProperty(value = "活动图片")
|
||||
private String image;
|
||||
|
||||
/**
|
||||
* 显示排序
|
||||
*/
|
||||
@ApiModelProperty(value = "显示排序")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 是否轮播广告:0-否,1-是
|
||||
*/
|
||||
@ApiModelProperty(value = "是否轮播广告:0-否,1-是")
|
||||
private String banner;
|
||||
|
||||
/**
|
||||
* 页面显示状态: 0-隐藏 1-显示
|
||||
*/
|
||||
@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;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@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 endTime;
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,49 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* 实体类 EventPartyQueryOutVO
|
||||
*
|
||||
* @auto.generated
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@Builder
|
||||
public class EventPartyQueryOutVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 党支部编码
|
||||
*/
|
||||
@ApiModelProperty(value = "党支部编码")
|
||||
private String branchCode;
|
||||
|
||||
|
||||
/**
|
||||
* 所属党支部
|
||||
*/
|
||||
@ApiModelProperty(value = "所属党支部")
|
||||
private String belongBranch;
|
||||
|
||||
/**
|
||||
* 所属党支部名称
|
||||
*/
|
||||
@ApiModelProperty(value = "所属党支部名称")
|
||||
private String belongBranchName;
|
||||
|
||||
|
||||
/**
|
||||
* 党员数量
|
||||
*/
|
||||
@ApiModelProperty(value = "党员数量")
|
||||
private Integer count;
|
||||
|
||||
|
||||
}
|
@ -20,15 +20,20 @@ public class EventQueryInVO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
* 党支部编码
|
||||
*/
|
||||
@ApiModelProperty(value = "党支部编码")
|
||||
private String belongBranch;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
* 参数
|
||||
*/
|
||||
@ApiModelProperty(value = "参数")
|
||||
private String param;
|
||||
|
||||
/**
|
||||
* 所属党支部名称
|
||||
*/
|
||||
@ApiModelProperty(value = "所属党支部名称")
|
||||
private String branchName;
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ public interface EventContactService extends IService<EventContact>{
|
||||
|
||||
|
||||
|
||||
Map<String, List<EventContact>> getEventContactGroup();
|
||||
Map<String, List<EventContact>> getEventContactGroup(String param);
|
||||
|
||||
List<EventContact> getEventContactList();
|
||||
|
||||
|
@ -14,4 +14,7 @@ public interface EventMockDataService extends IService<EventMockData>{
|
||||
|
||||
|
||||
List<EventMockData> getProfessionalDataList();
|
||||
|
||||
boolean saveRightData(List<EventMockData> list);
|
||||
|
||||
}
|
||||
|
@ -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.EventPartyQueryOutVO;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue;
|
||||
|
||||
@ -29,4 +30,6 @@ public interface EventPartyBranchService extends IService<EventPartyBranch>{
|
||||
boolean saveBranch(EventPartyBranch inVO);
|
||||
|
||||
boolean saveMember(EventPartyBranch inVO);
|
||||
|
||||
List<EventPartyQueryOutVO> getProvinceBranchList(EventQueryInVO inVO);
|
||||
}
|
||||
|
@ -25,9 +25,10 @@ public class EventContactServiceImpl extends ServiceImpl<EventContactMapper, Eve
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, List<EventContact>> getEventContactGroup() {
|
||||
public Map<String, List<EventContact>> getEventContactGroup(String param) {
|
||||
LambdaQueryWrapper<EventContact> query = Wrappers.lambdaQuery();
|
||||
query.eq(EventContact::getStatus, "1");
|
||||
query.eq(EventContact::getContactUnit, param);
|
||||
return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList()));
|
||||
}
|
||||
|
||||
|
@ -56,4 +56,16 @@ public class EventMockDataServiceImpl extends ServiceImpl<EventMockDataMapper, E
|
||||
});
|
||||
return returnList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean saveRightData(List<EventMockData> list) {
|
||||
List<String> collect = list.stream().map(EventMockData::getDataPy).collect(Collectors.toList());
|
||||
Map<String, String> map = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, EventMockData::getDataValue, (o1,o2) -> o2));
|
||||
LambdaQueryWrapper<EventMockData> query = Wrappers.lambdaQuery();
|
||||
query.in(EventMockData::getDataPy, collect);
|
||||
List<EventMockData> dataList = this.list(query);
|
||||
dataList.forEach(l -> l.setDataValue(map.get(l.getDataPy())));
|
||||
|
||||
return this.saveOrUpdateBatch(dataList);
|
||||
}
|
||||
}
|
||||
|
@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||
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.EventPartyQueryOutVO;
|
||||
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.enums.PartyEventExceptionEnum;
|
||||
@ -38,6 +39,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
||||
}
|
||||
List<MockDataValue> returnList = new ArrayList<>();
|
||||
list.forEach(f -> returnList.add(MockDataValue.builder().name(f.getContactName()).text(f.getEventDeclaration()).build()));
|
||||
Collections.shuffle(returnList);
|
||||
return returnList;
|
||||
}
|
||||
|
||||
@ -92,7 +94,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
||||
@Override
|
||||
public List<EventPartyBranch> getPartyMemberList(String belongBranch) {
|
||||
LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery();
|
||||
queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").eq(EventPartyBranch::getBelongBranch, belongBranch);
|
||||
queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").eq(EventPartyBranch::getBranchCode, belongBranch);
|
||||
return this.list(queryMember);
|
||||
}
|
||||
|
||||
@ -101,7 +103,10 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
||||
LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery();
|
||||
if (ObjectUtil.isNotNull(inVO)) {
|
||||
if (StrUtil.isNotBlank(inVO.getBelongBranch())) {
|
||||
queryMember.eq(EventPartyBranch::getBelongBranch, inVO.getBelongBranch());
|
||||
queryMember.eq(EventPartyBranch::getBranchCode, inVO.getBelongBranch());
|
||||
}
|
||||
if (StrUtil.isNotBlank(inVO.getBranchName())) {
|
||||
queryMember.eq(EventPartyBranch::getBranchName, inVO.getBranchName());
|
||||
}
|
||||
if (StrUtil.isNotBlank(inVO.getParam())) {
|
||||
queryMember.and(w -> w.like(EventPartyBranch::getContactName, inVO.getParam())
|
||||
@ -149,5 +154,31 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
||||
return this.save(inVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EventPartyQueryOutVO> getProvinceBranchList(EventQueryInVO inVO) {
|
||||
List<EventPartyQueryOutVO> returnList = new ArrayList<>();
|
||||
LambdaQueryWrapper<EventPartyBranch> query = Wrappers.lambdaQuery();
|
||||
if (ObjectUtil.isNull(inVO)) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
if (StrUtil.isNotBlank(inVO.getBelongBranch())) {
|
||||
query.eq(EventPartyBranch::getBranchCode, inVO.getBelongBranch());
|
||||
}
|
||||
if (StrUtil.isNotBlank(inVO.getBranchName())) {
|
||||
query.eq(EventPartyBranch::getBranchName, inVO.getBranchName());
|
||||
}
|
||||
|
||||
query.eq(EventPartyBranch::getType, "2")
|
||||
.eq(EventPartyBranch::getStatus, "1");
|
||||
|
||||
List<EventPartyBranch> list = this.list(query);
|
||||
List<String> nameList = list.stream().map(EventPartyBranch::getBelongBranchName).distinct().collect(Collectors.toList());
|
||||
Map<String, List<EventPartyBranch>> collect = list.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranchName));
|
||||
Map<String, String> nameMap = list.stream().collect(Collectors.toMap(EventPartyBranch::getBelongBranchName, EventPartyBranch::getBranchCode, (o1, o2) -> o1));
|
||||
nameList.forEach(n -> returnList.add(EventPartyQueryOutVO.builder().belongBranchName(n).count(collect.get(n).size()).branchCode(nameMap.get(n)).build()));
|
||||
|
||||
return returnList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -32,6 +32,7 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
|
||||
if (ObjectUtil.isNotNull(inVO) && StrUtil.isNotBlank(inVO.getParam())) {
|
||||
query.like(EventStyle::getTitle, inVO.getParam());
|
||||
}
|
||||
query.orderByDesc(EventStyle::getCreateTime);
|
||||
if ("banner".equals(type)) {
|
||||
query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort);
|
||||
return this.list(query);
|
||||
|
@ -46,35 +46,35 @@ public class EventSubjectServiceImpl extends ServiceImpl<EventSubjectMapper, Eve
|
||||
if (ObjectUtil.isNotNull(inVO)) {
|
||||
query.like(StrUtil.isNotBlank(inVO.getParam()), EventSubject::getTitle, inVO.getParam());
|
||||
}
|
||||
query.orderByAsc(EventSubject::getSort);
|
||||
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());
|
||||
List<String> teamMemberIdList = new ArrayList<>();
|
||||
list.forEach(f -> teamMemberIdList.addAll(Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList())));
|
||||
query.orderByDesc(EventSubject::getCreateTime);
|
||||
// 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());
|
||||
// List<String> teamMemberIdList = new ArrayList<>();
|
||||
// list.forEach(f -> teamMemberIdList.addAll(Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList())));
|
||||
|
||||
LambdaQueryWrapper<EventSubjectTime> querySubjectTime = Wrappers.lambdaQuery();
|
||||
querySubjectTime.eq(EventSubjectTime::getStatus, "1").in(EventSubjectTime::getSubjectId, subjectIdList);
|
||||
List<EventSubjectTime> subjectTimeList = eventSubjectTimeService.list(querySubjectTime);
|
||||
Map<String, List<EventSubjectTime>> timeMap = subjectTimeList.stream().collect(Collectors.groupingBy(EventSubjectTime::getSubjectId));
|
||||
// LambdaQueryWrapper<EventSubjectTime> querySubjectTime = Wrappers.lambdaQuery();
|
||||
// querySubjectTime.eq(EventSubjectTime::getStatus, "1").in(EventSubjectTime::getSubjectId, subjectIdList);
|
||||
// List<EventSubjectTime> subjectTimeList = eventSubjectTimeService.list(querySubjectTime);
|
||||
// Map<String, List<EventSubjectTime>> timeMap = subjectTimeList.stream().collect(Collectors.groupingBy(EventSubjectTime::getSubjectId));
|
||||
//
|
||||
// List<EventContact> eventContacts = contactService.listByIds(teamLeaderIdList);
|
||||
// Map<String, EventContact> leaderMap = eventContacts.stream().collect(Collectors.toMap(EventContact::getId, Function.identity()));
|
||||
//
|
||||
// LambdaQueryWrapper<EventContact> contactLambdaQuery = new LambdaQueryWrapper<>();
|
||||
// contactLambdaQuery.eq(EventContact::getStatus, "1").in(EventContact::getId, teamMemberIdList.stream().distinct().collect(Collectors.toList()));
|
||||
// List<EventContact> eventContactList = contactService.list(contactLambdaQuery);
|
||||
// Map<String, EventContact> eventContactMap = eventContactList.stream().collect(Collectors.toMap(EventContact::getId, Function.identity()));
|
||||
// list.forEach(f -> {
|
||||
// List<EventContact> contactList = new ArrayList<>();
|
||||
// List<String> 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()));
|
||||
// });
|
||||
|
||||
List<EventContact> eventContacts = contactService.listByIds(teamLeaderIdList);
|
||||
Map<String, EventContact> leaderMap = eventContacts.stream().collect(Collectors.toMap(EventContact::getId, Function.identity()));
|
||||
|
||||
LambdaQueryWrapper<EventContact> contactLambdaQuery = new LambdaQueryWrapper<>();
|
||||
contactLambdaQuery.eq(EventContact::getStatus, "1").in(EventContact::getId, teamMemberIdList.stream().distinct().collect(Collectors.toList()));
|
||||
List<EventContact> eventContactList = contactService.list(contactLambdaQuery);
|
||||
Map<String, EventContact> eventContactMap = eventContactList.stream().collect(Collectors.toMap(EventContact::getId, Function.identity()));
|
||||
list.forEach(f -> {
|
||||
List<EventContact> contactList = new ArrayList<>();
|
||||
List<String> 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;
|
||||
return this.list(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user