Merge branch 'uat_partyMemberEvent' into 'master'
Uat party member event See merge request eshop/biz_service_ebtp_extend!110
This commit is contained in:
@ -1,11 +1,16 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.feign.client;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 连接山分的文档中心服务
|
||||
*
|
||||
@ -34,4 +39,15 @@ public interface DocumentCenterService {
|
||||
@RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadStream")
|
||||
String getFileObjectDetail(@RequestParam("fileId") String fileId);
|
||||
|
||||
/**
|
||||
* 统计查询 sys_storage表中数据
|
||||
*
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn")
|
||||
BaseResponse<List<DocumentDataVO>> queryReturn(@RequestBody List<String> list);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -1,10 +1,14 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.feign.client.fallback;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 熔断
|
||||
*
|
||||
@ -27,4 +31,11 @@ public class DocumentCenterServiceFallbackImpl implements DocumentCenterService
|
||||
public String getFileObjectDetail(String fileId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse<List<DocumentDataVO>> queryReturn(List<String> list) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,27 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.feign.entity;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 实体类 DocumentDataVO
|
||||
*
|
||||
* @author yss
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class DocumentDataVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
private String fileId;
|
||||
private String objectId;
|
||||
private String originalName;
|
||||
private String filePath;
|
||||
private String fileSize;
|
||||
|
||||
|
||||
}
|
@ -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 EventRightDataVO inVO) {
|
||||
return BaseResponse.success(eventMockDataService.saveRightData(inVO));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("查询右侧栏数据")
|
||||
@PostMapping("/query/rightData")
|
||||
public BaseResponse<EventRightDataVO> queryRightData() {
|
||||
return BaseResponse.success(eventMockDataService.queryRightData());
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -52,9 +52,9 @@ public class PartyMemberEventController {
|
||||
|
||||
|
||||
@ApiOperation("活动联系人列表-按公司分组")
|
||||
@GetMapping("/eventContact/group")
|
||||
public BaseResponse<Map<String, List<EventContact>>> getEventContactGroup() {
|
||||
return BaseResponse.success(eventContactService.getEventContactGroup());
|
||||
@PostMapping("/eventContact/group")
|
||||
public BaseResponse<Map<String, List<EventContact>>> getEventContactGroup(@RequestBody(required = false) EventQueryInVO inVO) {
|
||||
return BaseResponse.success(eventContactService.getEventContactGroup(inVO));
|
||||
}
|
||||
|
||||
@ApiOperation("活动联系人列表")
|
||||
@ -77,22 +77,27 @@ 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")
|
||||
public BaseResponse<List<EventPartyBranch>> getPartyMemberListByParam(@RequestBody(required = false) EventQueryInVO inVO){
|
||||
public BaseResponse<List<EventPartyBranch>> getPartyMemberListByParam(@RequestBody(required = false) EventQueryInVO inVO){
|
||||
return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(inVO));
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* 意见提出人
|
||||
*/
|
||||
@ -76,6 +88,12 @@ public class EventContactSuggestion implements Serializable {
|
||||
@ApiModelProperty(value = "意见提出人组织机构")
|
||||
private String suggestionSponsorUnit;
|
||||
|
||||
/**
|
||||
* 意见提出人公司
|
||||
*/
|
||||
@ApiModelProperty(value = "意见提出人公司")
|
||||
private String company;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -36,13 +36,13 @@ public class EventPartyBranch implements Serializable {
|
||||
/**
|
||||
* 党支部编码
|
||||
*/
|
||||
@ApiModelProperty(value = "党支部编码")
|
||||
@ApiModelProperty(value = "省编码")
|
||||
private String branchCode;
|
||||
|
||||
/**
|
||||
* 党支部名称
|
||||
*/
|
||||
@ApiModelProperty(value = "党支部名称")
|
||||
@ApiModelProperty(value = "省名称")
|
||||
private String branchName;
|
||||
|
||||
/**
|
||||
|
@ -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,26 @@ 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 belongBranchName;
|
||||
|
||||
/**
|
||||
* 所属省名称
|
||||
*/
|
||||
@ApiModelProperty(value = "所属省名称")
|
||||
private String branchName;
|
||||
}
|
||||
|
@ -0,0 +1,42 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 实体类 EventRightDataOutVO
|
||||
*
|
||||
* @auto.generated
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel
|
||||
public class EventRightDataVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "订单交易总额")
|
||||
private String ddjyze;
|
||||
@ApiModelProperty(value = "订单总数量")
|
||||
private String ddzsl;
|
||||
@ApiModelProperty(value = "商品数量")
|
||||
private String spsl;
|
||||
@ApiModelProperty(value = "协议数量")
|
||||
private String xysl;
|
||||
@ApiModelProperty(value = "一线调研")
|
||||
private String yxdy;
|
||||
@ApiModelProperty(value = "访谈人数")
|
||||
private String ftrs;
|
||||
@ApiModelProperty(value = "保障需求")
|
||||
private String bzxq;
|
||||
@ApiModelProperty(value = "攻坚克难项目")
|
||||
private String gjknxm;
|
||||
|
||||
}
|
||||
|
||||
|
@ -111,5 +111,10 @@ public class EventStyle implements Serializable {
|
||||
@TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
|
||||
private java.time.LocalDateTime sendTime;
|
||||
|
||||
|
||||
/**
|
||||
* 文件地址
|
||||
*/
|
||||
@ApiModelProperty(value = "文件地址")
|
||||
@TableField(exist = false)
|
||||
private String filePath;
|
||||
}
|
||||
|
@ -11,6 +11,7 @@ public enum PartyEventExceptionEnum implements BusinessExceptionAssert {
|
||||
* 没有党支部信息
|
||||
*/
|
||||
FRAME_EXCEPTION_NO_BRANCH_INFO_FAIL(2200001, "没有党支部信息!"),
|
||||
FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL(2200002, "文档中心异常!"),
|
||||
|
||||
|
||||
|
||||
|
@ -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.EventContact;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -15,7 +16,7 @@ public interface EventContactService extends IService<EventContact>{
|
||||
|
||||
|
||||
|
||||
Map<String, List<EventContact>> getEventContactGroup();
|
||||
Map<String, List<EventContact>> getEventContactGroup(EventQueryInVO inVO);
|
||||
|
||||
List<EventContact> getEventContactList();
|
||||
|
||||
|
@ -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.EventMockData;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -14,4 +15,8 @@ public interface EventMockDataService extends IService<EventMockData>{
|
||||
|
||||
|
||||
List<EventMockData> getProfessionalDataList();
|
||||
|
||||
boolean saveRightData(EventRightDataVO inVO);
|
||||
|
||||
EventRightDataVO queryRightData();
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
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;
|
||||
@ -8,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.EventContactMapper;
|
||||
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.service.EventContactService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@ -25,9 +27,12 @@ public class EventContactServiceImpl extends ServiceImpl<EventContactMapper, Eve
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, List<EventContact>> getEventContactGroup() {
|
||||
public Map<String, List<EventContact>> getEventContactGroup(EventQueryInVO inVO) {
|
||||
LambdaQueryWrapper<EventContact> query = Wrappers.lambdaQuery();
|
||||
query.eq(EventContact::getStatus, "1");
|
||||
if (ObjectUtil.isNotNull(inVO) && StrUtil.isNotBlank(inVO.getParam())) {
|
||||
query.eq(EventContact::getContactUnit, inVO.getParam());
|
||||
}
|
||||
return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList()));
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
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;
|
||||
@ -32,6 +33,9 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl<EventContactS
|
||||
suggestion.setSuggestionSponsorId(cacheUser.getUserId());
|
||||
suggestion.setSuggestionSponsorUnit(cacheUser.getOrganizationId());
|
||||
suggestion.setCreateTime(LocalDateTime.now());
|
||||
if (StrUtil.isBlank(suggestion.getCompany())) {
|
||||
suggestion.setCompany(cacheUser.getOrganizationName());
|
||||
}
|
||||
return this.save(suggestion);
|
||||
}
|
||||
}
|
||||
|
@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService;
|
||||
@ -17,6 +18,7 @@ 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;
|
||||
|
||||
/**
|
||||
@ -56,4 +58,56 @@ public class EventMockDataServiceImpl extends ServiceImpl<EventMockDataMapper, E
|
||||
});
|
||||
return returnList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean saveRightData(EventRightDataVO inVO) {
|
||||
LambdaQueryWrapper<EventMockData> query = Wrappers.lambdaQuery();
|
||||
List<EventMockData> list = this.list(query.eq(EventMockData::getStatus, "1"));
|
||||
list.forEach(l -> {
|
||||
String dataPy = l.getDataPy();
|
||||
if ("ddjyze".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getDdjyze());
|
||||
}
|
||||
if ("ddzsl".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getDdzsl());
|
||||
}
|
||||
if ("spsl".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getSpsl());
|
||||
}
|
||||
if ("xysl".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getXysl());
|
||||
}
|
||||
if ("yxdy".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getYxdy());
|
||||
}
|
||||
if ("ftrs".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getFtrs());
|
||||
}
|
||||
if ("bzxq".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getBzxq());
|
||||
}
|
||||
if ("gjknxm".equals(dataPy)) {
|
||||
l.setDataValue(inVO.getGjknxm());
|
||||
}
|
||||
});
|
||||
return this.saveOrUpdateBatch(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EventRightDataVO queryRightData() {
|
||||
LambdaQueryWrapper<EventMockData> query = Wrappers.lambdaQuery();
|
||||
List<EventMockData> list = this.list(query.eq(EventMockData::getStatus, "1"));
|
||||
Map<String, EventMockData> dataMap = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, Function.identity()));
|
||||
EventRightDataVO dataVO = new EventRightDataVO();
|
||||
dataVO.setDdjyze(dataMap.get("ddjyze").getDataValue());
|
||||
dataVO.setDdzsl(dataMap.get("ddzsl").getDataValue());
|
||||
dataVO.setSpsl(dataMap.get("spsl").getDataValue());
|
||||
dataVO.setXysl(dataMap.get("xysl").getDataValue());
|
||||
dataVO.setYxdy(dataMap.get("yxdy").getDataValue());
|
||||
dataVO.setFtrs(dataMap.get("ftrs").getDataValue());
|
||||
dataVO.setBzxq(dataMap.get("bzxq").getDataValue());
|
||||
dataVO.setGjknxm(dataMap.get("gjknxm").getDataValue());
|
||||
|
||||
return dataVO;
|
||||
}
|
||||
}
|
||||
|
@ -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.getBelongBranchName())) {
|
||||
queryMember.like(EventPartyBranch::getBelongBranchName, inVO.getBelongBranchName());
|
||||
}
|
||||
if (StrUtil.isNotBlank(inVO.getParam())) {
|
||||
queryMember.and(w -> w.like(EventPartyBranch::getContactName, inVO.getParam())
|
||||
@ -149,5 +154,35 @@ 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());
|
||||
}
|
||||
|
||||
if (StrUtil.isNotBlank(inVO.getParam())) {
|
||||
query.like(EventPartyBranch::getBelongBranchName, inVO.getParam());
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -4,27 +4,38 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO;
|
||||
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.enums.PartyEventExceptionEnum;
|
||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 对数据表 event_style 操作的 serviceImpl
|
||||
* @author Auto create
|
||||
*
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventStyle> implements EventStyleService {
|
||||
|
||||
@Resource
|
||||
private DocumentCenterService documentCenterService;
|
||||
|
||||
@Override
|
||||
public List<EventStyle> getEventStyle(String type, EventQueryInVO inVO) {
|
||||
@ -32,13 +43,22 @@ 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);
|
||||
List<EventStyle> list;
|
||||
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);
|
||||
}
|
||||
list = this.list(query);
|
||||
List<String> imageIdList = list.stream().map(EventStyle::getImage).distinct().collect(Collectors.toList());
|
||||
BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
|
||||
log.info("文档中心返回:{}", queryReturn.toString());
|
||||
PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess());
|
||||
Map<String, DocumentDataVO> collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity(),(o1,o2) -> o1));
|
||||
|
||||
list.forEach(l -> l.setFilePath(collect.get(l.getImage()) == null ? "" : collect.get(l.getImage()).getFilePath()));
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -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