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 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 @@ + @@ -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 @@ t1.LAST_HANDLE_TIME DESC + t1.TOP_TIME DESC, t1.CREATED_TIME DESC LIMIT #{formDto.pageIndex},#{formDto.pageSize} ) temp @@ -121,6 +124,7 @@ item.LAST_HANDLE_TIME DESC + item.TOP_TIME DESC, item.CREATED_TIME DESC, img.IMG_URL