From 1282927f0f86e1c71a761e6c4a9a6ea7c3765bac Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Feb 2022 13:51:05 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/grid/editgrid=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/EditGridFormDTO.java    | 13 +++++++++++++
 .../epmet/service/impl/CustomerGridServiceImpl.java |  6 ++++++
 .../src/main/resources/mapper/CustomerGridDao.xml   |  6 ++++++
 3 files changed, 25 insertions(+)

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 1c42608fd8..a10eef56a3 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
@@ -59,4 +59,17 @@ public class EditGridFormDTO implements Serializable {
      */
     private String mobile;
 
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
 }
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 d9f604bb7d..79559818db 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
@@ -316,6 +316,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridDTO.setGridType(editGridFormDTO.getGridType());
         customerGridDTO.setContacts(editGridFormDTO.getContacts());
         customerGridDTO.setMobile(editGridFormDTO.getMobile());
+        if(StringUtils.isNotBlank(editGridFormDTO.getLongitude())){
+            customerGridDTO.setLongitude(editGridFormDTO.getLongitude());
+        }
+        if(StringUtils.isNotBlank(editGridFormDTO.getLatitude())){
+            customerGridDTO.setLatitude(editGridFormDTO.getLatitude());
+        }
         baseDao.editGrid(customerGridDTO);
 
         return new Result();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 623ca76ed4..2da590cd63 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -242,6 +242,12 @@
             contacts = #{contacts},
             mobile = #{mobile},
             updated_by = #{updatedBy},
+            <if test="longitude != null and longitude !=''">
+                LONGITUDE= #{longitude},
+            </if>
+            <if test="latitude != null and latitude !=''">
+                LATITUDE= #{latitude},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}