From adc7847af8aa6d9f7bb32985a437599643d2fea7 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 13 Jul 2022 11:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyEventMaintainController.java | 15 +- .../PartyMemberEventController.java | 6 +- .../dao/EventSubjectMapper.java | 18 +- .../dao/EventSubjectTimeMapper.java | 18 +- .../dao/mapper/EventSubjectMapper.xml | 40 +-- .../dao/mapper/EventSubjectTimeMapper.xml | 28 +- .../entity/EventMaintainInVO.java | 14 +- .../partyMemberEvent/entity/EventStyle.java | 2 +- .../partyMemberEvent/entity/EventSubject.java | 285 +++++++----------- .../entity/EventSubjectTime.java | 150 ++++----- .../EventContactSuggestionService.java | 3 +- .../service/EventStyleService.java | 7 +- .../service/EventSubjectService.java | 40 +-- .../service/EventSubjectTimeService.java | 30 +- .../EventContactSuggestionServiceImpl.java | 20 +- .../service/impl/EventStyleServiceImpl.java | 161 ++++------ .../service/impl/EventSubjectServiceImpl.java | 182 +++++------ .../impl/EventSubjectTimeServiceImpl.java | 36 +-- 18 files changed, 481 insertions(+), 574 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java index 3360e58..982f781 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.controller; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.poiExport.constant.ExportConstant; import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTable; @@ -31,8 +32,6 @@ public class PartyEventMaintainController { @Resource private EventPartyBranchService eventPartyBranchService; @Resource - private EventSubjectService eventSubjectService; - @Resource private EventContactService eventContactService; @Resource private EventContactSuggestionService eventContactSuggestionService; @@ -48,8 +47,8 @@ public class PartyEventMaintainController { @ApiOperation("保存攻坚项目") @PostMapping("/save/subject") - public BaseResponse saveSubject(@RequestBody EventSubject inVO) { - return BaseResponse.success(eventSubjectService.saveSubject(inVO)); + public BaseResponse saveSubject(@RequestBody EventStyle inVO) { + return BaseResponse.success(eventStyleService.saveSubject(inVO)); } @@ -87,8 +86,8 @@ public class PartyEventMaintainController { @ApiOperation("后台查询列表") @PostMapping("/styleProject/list") - public BaseResponse> queryStyleAndProject(@RequestBody(required = false) EventMaintainInVO inVO) { - return BaseResponse.success(eventStyleService.queryStyleAndProject(inVO)); + public BasePageResponse queryStyleAndProject(@RequestBody(required = false) EventMaintainInVO inVO) { + return BasePageResponse.success(eventStyleService.queryStyleAndProject(inVO)); } @@ -113,8 +112,8 @@ public class PartyEventMaintainController { @ApiOperation("后台查询列表") @PostMapping("/suggestion/list") - public BaseResponse> querySuggestion(@RequestBody(required = false) EventMaintainInVO inVO) { - return BaseResponse.success(eventContactSuggestionService.querySuggestion(inVO)); + public BasePageResponse querySuggestion(@RequestBody(required = false) EventMaintainInVO inVO) { + return BasePageResponse.success(eventContactSuggestionService.querySuggestion(inVO)); } @GetMapping(value = "/suggestion/export/") 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 a310929..0e5fd58 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 @@ -25,8 +25,6 @@ public class PartyMemberEventController { @Resource private EventPartyBranchService eventPartyBranchService; @Resource - private EventSubjectService eventSubjectService; - @Resource private EventContactService eventContactService; @Resource private EventContactSuggestionService eventContactSuggestionService; @@ -103,8 +101,8 @@ public class PartyMemberEventController { @ApiOperation("活动课题列表") @PostMapping("/eventSubject/list") - public BaseResponse> getEventSubjectList(@RequestBody(required = false) EventQueryInVO inVO) { - return BaseResponse.success(eventSubjectService.getEventSubjectList(inVO)); + public BaseResponse> getEventSubjectList(@RequestBody(required = false) EventQueryInVO inVO) { + return BaseResponse.success(eventStyleService.getEventSubjectList(inVO)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectMapper.java index 6c2b326..d9a43c3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectMapper.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; - -public interface EventSubjectMapper extends BaseMapper { - - -} +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao; +// +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; +// +//public interface EventSubjectMapper extends BaseMapper { +// +// +//} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectTimeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectTimeMapper.java index 877ba24..fa969dc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectTimeMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/EventSubjectTimeMapper.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; - -public interface EventSubjectTimeMapper extends BaseMapper { - - -} +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao; +// +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; +// +//public interface EventSubjectTimeMapper extends BaseMapper { +// +// +//} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectMapper.xml index 7ad79ab..6ef03b0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventSubjectMapper.xml @@ -1,27 +1,19 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file 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 0b1b83e..c792de5 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 @@ -1,17 +1,17 @@ - - + + - - - - - - - - - - + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java index c61b08d..f7dbdd7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java @@ -11,7 +11,10 @@ import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.time.LocalDateTime; /** * 实体类 EventMaintainInVO @@ -63,5 +66,14 @@ public class EventMaintainInVO implements Serializable { @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; + private LocalDateTime endTime; + + @ApiModelProperty("当前页") + @NotNull + @Min(0L) + private Integer pageNo; + @ApiModelProperty("每页显示条数") + @NotNull + @Min(0L) + private Integer pageSize; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java index a6c1795..aea2119 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java @@ -60,7 +60,7 @@ public class EventStyle implements Serializable { /** * 类别 */ - @ApiModelProperty(value = "类别") + @ApiModelProperty(value = "类别 1-首页，2-活动风采，3-攻坚克难") private String category; /** 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 351a179..0368e54 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 @@ -1,177 +1,108 @@ -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; -import java.util.List; - -/** - * 实体类 EventSubject - * - * @auto.generated - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "event_subject", autoResultMap = true) -public class EventSubject implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId - @ApiModelProperty(value = "id") - private String id; - - /** - * 活动标题 - */ - @ApiModelProperty(value = "活动标题") - private String title; - - /** - * 类别 - */ - @ApiModelProperty(value = "类别") - private String category; - - /** - * 活动内容正文 - */ - @ApiModelProperty(value = "活动内容正文") - private String content; - - /** - * 正文图片id - */ - @ApiModelProperty(value = "正文图片id") - private String contentImageId; - - /** - * 活动图片 - */ - @ApiModelProperty(value = "活动图片") - private String image; - - /** - * 显示排序 - */ - @ApiModelProperty(value = "显示排序") - private Integer sort; - - /** - * 页面显示状态 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 = "发布人") - private String createBy; - - - /** - * 删除标识 - */ - @ApiModelProperty(value = "删除标识") - private String deleteFlag; - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - /** - * 实施单位 - */ - @ApiModelProperty(value = "实施单位") - private String unitName; - - /** - * 团队牵头人 - */ - @ApiModelProperty(value = "团队牵头人") - private String teamLeader; - - /** - * 团队成员 - */ - @ApiModelProperty(value = "团队成员") - private String teamMenber; - - /** - * 项目内容-针对的痛点难点问题 - */ - @ApiModelProperty(value = "项目内容-针对的痛点难点问题") - private String projectContentProblem; - - /** - * 项目内容-解决问题的主要思路和措施 - */ - @ApiModelProperty(value = "项目内容-解决问题的主要思路和措施") - private String projectContentSolve; - - /** - * 项目内容-预计达到的可感知可量化的效果 - */ - @ApiModelProperty(value = "项目内容-预计达到的可感知可量化的效果") - private String projectContentResult; - - /** - * 需要集团公司提供的供应链平台开发及运营支撑资源（若有） - */ - @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; -} +//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; +// +///** +// * 实体类 EventSubject +// * +// * @auto.generated +// */ +//@Data +//@Accessors(chain = true) +//@ApiModel +//@TableName(value = "event_subject", autoResultMap = true) +//public class EventSubject implements Serializable { +// +// private static final long serialVersionUID = 1L; +// +// /** +// * id +// */ +// @TableId +// @ApiModelProperty(value = "id") +// private String id; +// +// /** +// * 活动标题 +// */ +// @ApiModelProperty(value = "活动标题") +// private String title; +// +// /** +// * 类别 +// */ +// @ApiModelProperty(value = "类别") +// private String category; +// +// /** +// * 活动内容正文 +// */ +// @ApiModelProperty(value = "活动内容正文") +// private String content; +// +// /** +// * 正文图片id +// */ +// @ApiModelProperty(value = "正文图片id") +// private String contentImageId; +// +// /** +// * 活动图片 +// */ +// @ApiModelProperty(value = "活动图片") +// private String image; +// +// /** +// * 显示排序 +// */ +// @ApiModelProperty(value = "显示排序") +// private Integer sort; +// +// /** +// * 页面显示状态 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 = "发布人") +// private String createBy; +// +// /** +// * 删除标识 +// */ +// @ApiModelProperty(value = "删除标识") +// private String deleteFlag; +// +//} 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 e23e32c..b39cbd6 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 @@ -1,75 +1,75 @@ -package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -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; - -/** - * 实体类 EventSubjectTime - * - * @auto.generated - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "event_subject_time", autoResultMap = true) -public class EventSubjectTime implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ApiModelProperty(value = "id") - private String id; - - /** - * 活动标题表id - */ - @ApiModelProperty(value = "活动标题表id") - private String subjectId; - - /** - * 里程碑 - */ - @ApiModelProperty(value = "里程碑") - private String milestone; - - /** - * 里程碑时间 - */ - @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 milestoneTime; - - /** - * 里程碑预期目标 - */ - @ApiModelProperty(value = "里程碑预期目标") - private String milestoneTarget; - - /** - * 显示排序 - */ - @ApiModelProperty(value = "显示排序") - private Integer sort; - - /** - * 页面显示状态 0-隐藏 1-显示 - */ - @ApiModelProperty(value = "页面显示状态 0-隐藏 1-显示") - private String status; - - - -} +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; +// +//import com.baomidou.mybatisplus.annotation.TableField; +//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; +// +///** +// * 实体类 EventSubjectTime +// * +// * @auto.generated +// */ +//@Data +//@Accessors(chain = true) +//@ApiModel +//@TableName(value = "event_subject_time", autoResultMap = true) +//public class EventSubjectTime implements Serializable { +// +// private static final long serialVersionUID = 1L; +// +// /** +// * id +// */ +// @ApiModelProperty(value = "id") +// private String id; +// +// /** +// * 活动标题表id +// */ +// @ApiModelProperty(value = "活动标题表id") +// private String subjectId; +// +// /** +// * 里程碑 +// */ +// @ApiModelProperty(value = "里程碑") +// private String milestone; +// +// /** +// * 里程碑时间 +// */ +// @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 milestoneTime; +// +// /** +// * 里程碑预期目标 +// */ +// @ApiModelProperty(value = "里程碑预期目标") +// private String milestoneTarget; +// +// /** +// * 显示排序 +// */ +// @ApiModelProperty(value = "显示排序") +// private Integer sort; +// +// /** +// * 页面显示状态 0-隐藏 1-显示 +// */ +// @ApiModelProperty(value = "页面显示状态 0-隐藏 1-显示") +// private String status; +// +// +// +//} 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 29cf17a..14b99fb 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 @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTable; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContactSuggestion; @@ -17,7 +18,7 @@ public interface EventContactSuggestionService extends IService querySuggestion(EventMaintainInVO inVO); + IPage querySuggestion(EventMaintainInVO inVO); ExcelTable export(List ids); } 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 838ad6d..77b4837 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventStyleService.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMaintainInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMaintainOutVO; @@ -20,11 +21,15 @@ public interface EventStyleService extends IService{ boolean saveStyle(EventStyle inVO); - List queryStyleAndProject(EventMaintainInVO inVO); + IPage queryStyleAndProject(EventMaintainInVO inVO); boolean saveStyleOrProject(EventMaintainOutVO inVO); boolean sendStyleOrProject(String id,String status); boolean deleteStyleOrProject(String id); + + List getEventSubjectList(EventQueryInVO inVO); + + boolean saveSubject(EventStyle inVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java index 3216a83..7b3c8f3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java @@ -1,20 +1,20 @@ -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; - -/** - * 对数据表 event_subject 操作的 service - * @author Auto create - * - */ -public interface EventSubjectService extends IService{ - - - List getEventSubjectList(EventQueryInVO inVO); - - boolean saveSubject(EventSubject inVO); -} +//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; +// +///** +// * 对数据表 event_subject 操作的 service +// * @author Auto create +// * +// */ +//public interface EventSubjectService extends IService{ +// +// +// List getEventSubjectList(EventQueryInVO inVO); +// +// boolean saveSubject(EventSubject inVO); +//} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectTimeService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectTimeService.java index ee7147f..c687aab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectTimeService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectTimeService.java @@ -1,15 +1,15 @@ -package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; - -/** - * 对数据表 event_subject_time 操作的 service - * @author Auto create - * - */ -public interface EventSubjectTimeService extends IService{ - - - -} +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; +// +//import com.baomidou.mybatisplus.extension.service.IService; +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; +// +///** +// * 对数据表 event_subject_time 操作的 service +// * @author Auto create +// * +// */ +//public interface EventSubjectTimeService extends IService{ +// +// +// +//} 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 265b054..6c929f1 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 @@ -4,9 +4,10 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTable; @@ -16,7 +17,6 @@ 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.entity.EventMaintainInVO; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubject; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactSuggestionService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -25,10 +25,7 @@ import javax.annotation.Resource; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /** @@ -57,10 +54,10 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl querySuggestion(EventMaintainInVO inVO) { - if (ObjectUtil.isNull(inVO)) { - return this.list(); - } + public IPage querySuggestion(EventMaintainInVO inVO) { + + Page page = new Page<>(inVO.getPageNo(), inVO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (ObjectUtil.isNotNull(inVO.getStartTime())) { query.gt(EventContactSuggestion::getCreateTime, inVO.getStartTime()); @@ -72,7 +69,7 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl getEventStyle(String type, EventQueryInVO inVO) { @@ -83,64 +84,62 @@ public class EventStyleServiceImpl extends ServiceImpl getEventSubjectList(EventQueryInVO inVO) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(EventStyle::getStatus, "1"); + query.eq(EventStyle::getCategory, "3"); + if (ObjectUtil.isNotNull(inVO)) { + query.like(StrUtil.isNotBlank(inVO.getParam()), EventStyle::getTitle, inVO.getParam()); + } + query.ne(EventStyle::getDeleteFlag, "1"); + query.orderByDesc(EventStyle::getCreateTime); + + return this.list(query); + } @Override - public List queryStyleAndProject(EventMaintainInVO inVO) { - List styleList = new ArrayList<>(); - List subjectList = new ArrayList<>(); + public boolean saveSubject(EventStyle inVO) { + if (StrUtil.isNotBlank(inVO.getId())) { + return this.updateById(inVO); + } + inVO.setId(PropertyUtils.getSnowflakeId()); + inVO.setStatus("1"); + inVO.setCreateTime(LocalDateTime.now()); + return this.save(inVO); + } + + @Override + public IPage queryStyleAndProject(EventMaintainInVO inVO) { + LambdaQueryWrapper queryStyle = Wrappers.lambdaQuery(); queryStyle.ne(EventStyle::getDeleteFlag, "1"); - LambdaQueryWrapper queryProject = Wrappers.lambdaQuery(); - queryProject.ne(EventSubject::getDeleteFlag, "1"); - if (ObjectUtil.isNull(inVO)) { - styleList = this.list(queryStyle); - subjectList = eventSubjectService.list(queryProject); - } else { - if (StrUtil.isNotBlank(inVO.getType()) && !"3".equals(inVO.getType()) ) { - if (StrUtil.isNotBlank(inVO.getTitle())) { - queryStyle.like(EventStyle::getTitle, inVO.getTitle()); - } - if (StrUtil.isNotBlank(inVO.getType())) { - queryStyle.eq(EventStyle::getBanner, "1".equals(inVO.getType()) ? "1" : "0"); - } - if (StrUtil.isNotBlank(inVO.getStatus())) { - queryStyle.eq(EventStyle::getStatus, inVO.getStatus()); - } - if (ObjectUtil.isNotNull(inVO.getStartTime())) { - queryStyle.gt(EventStyle::getSendTime, inVO.getStartTime()); - } - - if (ObjectUtil.isNotNull(inVO.getEndTime())) { - queryStyle.lt(EventStyle::getSendTime, inVO.getEndTime()); - } - styleList = this.list(queryStyle); - } - - - if (StrUtil.isNotBlank(inVO.getType()) && !"1".equals(inVO.getType()) && !"2".equals(inVO.getType())) { - - if (StrUtil.isNotBlank(inVO.getTitle())) { - queryProject.like(EventSubject::getTitle, inVO.getTitle()); - } - - if (StrUtil.isNotBlank(inVO.getStatus())) { - queryProject.eq(EventSubject::getStatus, inVO.getStatus()); - } - if (ObjectUtil.isNotNull(inVO.getStartTime())) { - queryProject.gt(EventSubject::getSendTime, inVO.getStartTime()); - } - - if (ObjectUtil.isNotNull(inVO.getEndTime())) { - queryProject.lt(EventSubject::getSendTime, inVO.getEndTime()); - } - subjectList = eventSubjectService.list(queryProject); - } + if (StrUtil.isNotBlank(inVO.getTitle())) { + queryStyle.like(EventStyle::getTitle, inVO.getTitle()); } + if (StrUtil.isNotBlank(inVO.getType())) { + queryStyle.eq(EventStyle::getCategory, inVO.getType()); + } + if (StrUtil.isNotBlank(inVO.getStatus())) { + queryStyle.eq(EventStyle::getStatus, inVO.getStatus()); + } + if (ObjectUtil.isNotNull(inVO.getStartTime())) { + queryStyle.gt(EventStyle::getSendTime, inVO.getStartTime()); + } + + if (ObjectUtil.isNotNull(inVO.getEndTime())) { + queryStyle.lt(EventStyle::getSendTime, inVO.getEndTime()); + } + + Page page = new Page<>(inVO.getPageNo(), inVO.getPageSize()); + + Page stylePage = this.page(page, queryStyle); + List outVOList = new ArrayList<>(); - if (!styleList.isEmpty()) { - styleList.forEach(s -> outVOList.add( + if (!stylePage.getRecords().isEmpty()) { + stylePage.getRecords().forEach(s -> outVOList.add( EventMaintainOutVO.builder() .id(s.getId()) .sort(s.getSort()) @@ -149,28 +148,20 @@ public class EventStyleServiceImpl extends ServiceImpl outVOList.add( - EventMaintainOutVO.builder() - .id(s.getId()) - .sort(s.getSort()) - .status(s.getStatus()) - .image(s.getImage()) - .title(s.getTitle()) - .content(s.getContent()) - .type("3") - .createTime(s.getCreateTime()) - .createBy(s.getCreateBy()) - .sendTime(s.getSendTime()) - .build())); - } - return outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getSendTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList()); + List collect = outVOList.stream().sorted(Comparator.comparing(EventMaintainOutVO::getSendTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()).collect(Collectors.toList()); + IPage iPage = new Page<>(); + iPage.setTotal(stylePage.getTotal()); + iPage.setPages(stylePage.getPages()); + iPage.setCurrent(stylePage.getCurrent()); + iPage.setSize(stylePage.getSize()); + iPage.setRecords(collect); + return iPage; } @Override @@ -182,25 +173,14 @@ public class EventStyleServiceImpl extends ServiceImpl implements EventSubjectService { - - @Resource - private EventSubjectTimeService eventSubjectTimeService; - @Resource - private EventContactService contactService; - - @Override - public List getEventSubjectList(EventQueryInVO inVO) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.eq(EventSubject::getStatus, "1"); - if (ObjectUtil.isNotNull(inVO)) { - query.like(StrUtil.isNotBlank(inVO.getParam()), EventSubject::getTitle, inVO.getParam()); - } - query.ne(EventSubject::getDeleteFlag, "1"); - query.orderByDesc(EventSubject::getCreateTime); -// 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)); +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; // -// 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 this.list(query); - } - - @Override - public boolean saveSubject(EventSubject inVO) { - if (StrUtil.isNotBlank(inVO.getId())) { - return this.updateById(inVO); - } - inVO.setId(PropertyUtils.getSnowflakeId()); - inVO.setStatus("1"); - inVO.setCreateTime(LocalDateTime.now()); - return this.save(inVO); - } - - -} +//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.common.util.PropertyUtils; +//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; +//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.time.LocalDateTime; +//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 +// * +// */ +//@Service +//public class EventSubjectServiceImpl extends ServiceImpl implements EventSubjectService { +// +// @Resource +// private EventSubjectTimeService eventSubjectTimeService; +// @Resource +// private EventContactService contactService; +// +// @Override +// public List getEventSubjectList(EventQueryInVO inVO) { +// LambdaQueryWrapper query = Wrappers.lambdaQuery(); +// query.eq(EventSubject::getStatus, "1"); +// if (ObjectUtil.isNotNull(inVO)) { +// query.like(StrUtil.isNotBlank(inVO.getParam()), EventSubject::getTitle, inVO.getParam()); +// } +// query.ne(EventSubject::getDeleteFlag, "1"); +// query.orderByDesc(EventSubject::getCreateTime); +//// 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 this.list(query); +// } +// +// @Override +// public boolean saveSubject(EventSubject inVO) { +// if (StrUtil.isNotBlank(inVO.getId())) { +// return this.updateById(inVO); +// } +// inVO.setId(PropertyUtils.getSnowflakeId()); +// inVO.setStatus("1"); +// inVO.setCreateTime(LocalDateTime.now()); +// return this.save(inVO); +// } +// +// +//} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectTimeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectTimeServiceImpl.java index 1144044..8f926cb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectTimeServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectTimeServiceImpl.java @@ -1,18 +1,18 @@ -package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; - - -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventSubjectTimeMapper; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventSubjectTimeService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -/** - * 对数据表 event_subject_time 操作的 serviceImpl - * @author Auto create - * - */ -@Service -public class EventSubjectTimeServiceImpl extends ServiceImpl implements EventSubjectTimeService { - - -} +//package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +// +// +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventSubjectTimeMapper; +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventSubjectTime; +//import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventSubjectTimeService; +//import org.springframework.stereotype.Service; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +///** +// * 对数据表 event_subject_time 操作的 serviceImpl +// * @author Auto create +// * +// */ +//@Service +//public class EventSubjectTimeServiceImpl extends ServiceImpl implements EventSubjectTimeService { +// +// +//}