diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 0acd914fa6..9184969e62 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -155,4 +155,9 @@ public class CustomerGridDTO implements Serializable { * 弃用:1;正常使用:0 */ private Integer abandonFlag; + + /** + * 网格排序 + */ + private Integer sort; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java index 8774da4f99..b5fd88597c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java @@ -77,4 +77,9 @@ public class EditGridFormDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + /** + * 网格排序 + */ + private Integer sort; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 162aed146b..e5c3386ac4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -344,6 +344,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl CENTER_ADDRESS= #{centerAddress}, + + sort = #{sort}, + UPDATED_TIME=NOW() where id = #{id} @@ -474,8 +477,10 @@ AND grid.customer_id = #{customerId} ORDER BY - grid.customer_id, - CONVERT ( gridName USING gbk ) ASC + CONVERT ( gridName USING gbk ) ASC, + grid.sort, + grid.customer_id + LIMIT #{pageNo}, #{pageSize}