From d51c9bbd73348aff1afc7d160cbacfa252f3aff2 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 21 Sep 2020 19:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/result/ItemResultDTO.java   |  5 +++++
 .../epdc/modules/item/entity/ItemEntity.java  | 20 +++++++++++++++++++
 .../main/resources/mapper/item/ItemDao.xml    |  6 +++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
index 5a7962cc..ce3d3bee 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
@@ -84,4 +84,9 @@ public class ItemResultDTO implements Serializable {
      * 事件标签
      */
     private List<String> tagNames;
+
+    /**
+     * 置顶标识：0-否，1-是
+     */
+    private String topFlag;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
index 69c336f2..f2d25e49 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
@@ -212,4 +212,24 @@ public class ItemEntity extends BaseEpdcEntity {
 	 */
 	private String itemCode;
 
+    /**
+     * 置顶标识：0-否，1-是
+     */
+    private String topFlag;
+
+    /**
+     * 置顶时间
+     */
+    private String topTime;
+
+    /**
+     * 置顶人ID
+     */
+    private String topUserId;
+
+    /**
+     * 置顶人
+     */
+    private String topUserName;
+
 }
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 54166343..3f9625a4 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
@@ -24,6 +24,7 @@
         <result property="latestProgress.progressName" column="stateName"/>
         <result property="latestProgress.createdTime" column="handleTime"/>
         <result property="latestProgress.advice" column="OUT_HANDLE_ADVICE"/>
+        <result property="topFlag" column="TOP_FLAG"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -57,7 +58,8 @@
         WHEN 10 THEN
         '已结案' ELSE ''
         END AS stateName,
-        et.TAG_NAME
+        et.TAG_NAME,
+        item.TOP_FLAG
         FROM
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
@@ -113,6 +115,7 @@
                 <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
                     t1.LAST_HANDLE_TIME DESC
                 </if>
+                t1.TOP_TIME DESC,
                 t1.CREATED_TIME DESC
                 LIMIT #{formDto.pageIndex},#{formDto.pageSize}
             ) temp
@@ -121,6 +124,7 @@
         <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
             item.LAST_HANDLE_TIME DESC
         </if>
+        item.TOP_TIME DESC,
         item.CREATED_TIME DESC,
         img.IMG_URL
     </select>