option查询

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@@ -70,14 +70,14 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     /**
      * 测绘院网格
      */
-    private String gisGridName;
+    private String gisGridId;
 
-    public String getGisGridName() {
+    public String getGisGridId() {
-        return gisGridName;
+        return gisGridId;
     }
 
-    public void setGisGridName(String gisGridName) {
+    public void setGisGridId(String gisGridId) {
-        this.gisGridName = gisGridName;
+        this.gisGridId = gisGridId;
     }
 
     @ApiModelProperty(value = "地址")

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/GisGridDao.java

@@ -39,5 +39,5 @@ public interface GisGridDao extends BaseDao<GisGridEntity> {
      * @author zhy
      * @date 2022/9/5 10:54
      */
-    void deleteByGridName(GisGridDTO dto);
+    void deleteByGridInfo(GisGridDTO dto);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/GisGridServiceImpl.java

@@ -130,12 +130,19 @@ public class GisGridServiceImpl extends BaseServiceImpl<GisGridDao, GisGridEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveRelation(SysDeptDTO dto) {
-        if (StringUtils.isNotBlank(dto.getGisGridName())) {
+        if (StringUtils.isNotBlank(dto.getGisGridId())) {
             GisGridDTO gisGridDTO = new GisGridDTO();
             gisGridDTO.setGridId(dto.getId());
             gisGridDTO.setGridName(dto.getName());
-            gisGridDTO.setGisGridName(dto.getGisGridName());
+            gisGridDTO.setGisGridId(dto.getGisGridId());
-            baseDao.deleteByGridName(gisGridDTO);
+            baseDao.deleteByGridInfo(gisGridDTO);
+
+            Map<String, Object> params = new HashMap<>(2);
+            params.put("gisGridId", dto.getGisGridId());
+            GisGridEntity exist = baseDao.selectOne(getWrapper(params));
+            if (exist != null) {
+                gisGridDTO.setGisGridName(exist.getGisGridName());
+            }
 
             GisGridEntity entity = ConvertUtils.sourceToTarget(gisGridDTO, GisGridEntity.class);
             insert(entity);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -152,7 +152,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 
         GisGridDTO gisGridDTO = gisGridService.getByGridName(dto.getName());
         if (gisGridDTO != null) {
-            dto.setGisGridName(dto.getGisGridName());
+            dto.setGisGridId(dto.getGisGridId());
         }
         return dto;
     }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisDao.xml

@@ -22,6 +22,7 @@
 
     <select id="listGridOption" resultType="com.elink.esua.epdc.dto.GisGridResultDTO">
         SELECT DISTINCT
+            GRID_ID AS GIS_GRID_ID,
             GRID_NAME AS GIS_GRID_NAME
         FROM
             epdc_gis

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml

@@ -16,15 +16,16 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <delete id="deleteByGridName">
+    <delete id="deleteByGridInfo">
         DELETE
         FROM
             epdc_gis_grid
         WHERE
-            GRID_NAME = '2'
+            GRID_NAME = #{gridName}
-           OR GIS_GRID_NAME = '1'
+        OR GRID_ID = #{gridId}
-        <if test="gridId != null and gridId != '' ">
+        OR GIS_GRID_ID = #{gisGridId}
-            OR GRID_ID = '1'
+        <if test="gisGridName != null and gisGridName != '' ">
+            OR GIS_GRID_NAME = #{gisGridName}
         </if>
     </delete>
 </mapper>