添加排序条件

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

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

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<CustomerGridDao, Cu
         customerGridDTO.setGridType(editGridFormDTO.getGridType());
         customerGridDTO.setContacts(editGridFormDTO.getContacts());
         customerGridDTO.setMobile(editGridFormDTO.getMobile());
+        customerGridDTO.setSort(editGridFormDTO.getSort());
         if(StringUtils.isNotBlank(editGridFormDTO.getLongitude())){
             customerGridDTO.setLongitude(editGridFormDTO.getLongitude());
         }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.40__add_column.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `epmet_gov_org`.`customer_grid`
+ADD COLUMN `sort` int(11) NULL COMMENT '网格排序' AFTER `MOBILE`;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -256,6 +256,9 @@
             <if test="centerAddress != null and centerAddress !=''">
                 CENTER_ADDRESS= #{centerAddress},
             </if>
+            <if test="sort != null and sort != ''">
+                sort = #{sort},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}
@@ -474,8 +477,10 @@
             </if>
             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}
     </select>