From d4cfb34cb3beafe8890380cff83f366f29de5431 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 22 Sep 2020 09:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E7=BD=AE?= =?UTF-8?q?=E9=A1=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/item/ItemPendingHandleDTO.java | 5 +++ .../esua/epdc/dto/item/ItemTopFormDTO.java | 33 +++++++++++++++++++ .../item/controller/ItemController.java | 16 +++++++++ .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++++++ .../modules/item/service/ItemService.java | 11 +++++++ .../item/service/impl/ItemServiceImpl.java | 14 ++++++++ .../main/resources/mapper/item/ItemDao.xml | 15 ++++++++- 7 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemTopFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java index e88e9c1f..80922b16 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java @@ -60,4 +60,9 @@ public class ItemPendingHandleDTO implements Serializable { */ private String itemCode; + /** + * 置顶标识：0-否，1-是 + */ + private String topFlag; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemTopFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemTopFormDTO.java new file mode 100644 index 00000000..157b1e21 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemTopFormDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.item; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class ItemTopFormDTO implements Serializable { + private static final long serialVersionUID = 8832682452577223909L; + + /** + * 项目ID + */ + @NotBlank(message = "项目ID不能为空") + private String itemId; + + /** + * 置顶标识：0-取消置顶，1-置顶 + */ + @NotBlank(message = "置顶标识不能为空") + private String topFlag; + + /** + * 置顶人ID + */ + private String topUserId; + + /** + * 置顶人 + */ + private String topUserName; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 0d1a2fb3..6f001102 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.item.controller; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -30,6 +31,7 @@ import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; +import com.elink.esua.epdc.dto.item.ItemTopFormDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO; @@ -220,4 +222,18 @@ public class ItemController { return itemService.modifyCommentById(eventDeleteCommentsFormDTO.getCommentIds()); } + /** + * 项目置顶或取消置顶 + * + * @param formDto 参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/9/8 9:33 + */ + @PostMapping("top") + public Result itemTop(@RequestBody ItemTopFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return itemService.modifyItemTopFlag(formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index dd93c2fa..3c7df5a8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; +import com.elink.esua.epdc.dto.item.ItemTopFormDTO; import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; @@ -278,4 +279,14 @@ public interface ItemDao extends BaseDao { * @return void **/ void rejectItemSatisfactionInfo(String id); + + /** + * 更新项目置顶状态 + * + * @param formDto + * @return void + * @author Liuchuang + * @since 2020/9/22 9:52 + */ + void updateItemTopFlagById(@Param("formDto") ItemTopFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index c25af812..cca95279 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; +import com.elink.esua.epdc.dto.item.ItemTopFormDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -407,4 +408,14 @@ public interface ItemService extends BaseService { * @since 2020/9/16 10:37 */ int selectItemCountByIssueId(String issueId); + + /** + * 项目置顶或取消置顶 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/9/22 9:45 + */ + Result modifyItemTopFlag(ItemTopFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 9dd2752e..45fd0585 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1563,4 +1563,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem return baseDao.selectCount(wrapper); } + + @Override + public Result modifyItemTopFlag(ItemTopFormDTO formDto) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("登陆信息已过期，请退出重新登陆"); + } + formDto.setTopUserId(user.getId() == null ? "":user.getId().toString()); + formDto.setTopUserName(user.getUsername()); + // 更新项目置顶状态 + baseDao.updateItemTopFlagById(formDto); + + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 3f9625a4..50faf1d0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -452,7 +452,8 @@ eve.OPPOSE_NUM, eve.COMMENT_NUM, eve.BROWSE_NUM, - ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum + ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum, + item.TOP_FLAG FROM epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID @@ -504,6 +505,7 @@ AND item.ITEM_CODE like concat('%', #{itemCode}, '%') ORDER BY + item.TOP_TIME DESC, item.CREATED_TIME DESC @@ -1037,4 +1039,15 @@ update epdc_item set EVALUATION_SCORE = null,EVALUATION_CONTENT = null,EVALUATION_TIME = null where id = #{id} + + + UPDATE epdc_item SET TOP_FLAG = #{formDto.topFlag}, TOP_USER_ID = #{formDto.topUserId}, TOP_USER_NAME = #{formDto.topUserName} + + , TOP_TIME = NULL + + + , TOP_TIME = NOW() + + WHERE ID = #{formDto.topicId} +