待处理和已结案项目增加置顶功能

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;
+
 }

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;
+}

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);
+    }
+
 }

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<ItemEntity> {
      * @return void
      **/
     void rejectItemSatisfactionInfo(String id);
+
+    /**
+     * 更新项目置顶状态
+     *
+     * @param formDto
+     * @return void
+     * @author Liuchuang
+     * @since 2020/9/22 9:52
+     */
+    void updateItemTopFlagById(@Param("formDto") ItemTopFormDTO formDto);
 }

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<ItemEntity> {
      * @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);
 }

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<ItemDao, ItemEntity> 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();
+    }
 }

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}, '%')
         </if>
         ORDER BY
+            item.TOP_TIME DESC,
             item.CREATED_TIME DESC
     </select>
 
@@ -1037,4 +1039,15 @@
     <update id="rejectItemSatisfactionInfo">
         update epdc_item set EVALUATION_SCORE = null,EVALUATION_CONTENT = null,EVALUATION_TIME = null where id = #{id}
     </update>
+
+    <update id="updateItemTopFlagById">
+        UPDATE epdc_item SET TOP_FLAG = #{formDto.topFlag}, TOP_USER_ID = #{formDto.topUserId}, TOP_USER_NAME = #{formDto.topUserName}
+        <if test='formDto.topFlag == "0"'>
+            , TOP_TIME = NULL
+        </if>
+        <if test='formDto.topFlag == "1"'>
+            , TOP_TIME = NOW()
+        </if>
+        WHERE ID = #{formDto.topicId}
+    </update>
 </mapper>