Merge remote-tracking branch 'origin/master'

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

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

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>