页面样式调整，bug修改。

src/main/java/cn/com/tenlion/systemhouse/pojo/dtos/residential/ResidentialDTO.java

@@ -54,6 +54,8 @@ public class ResidentialDTO {
     private String phone;
     @ApiModelProperty(name = "community", value = "社区")
     private String community;
+    @ApiModelProperty(name = "communityName", value = "社区")
+    private String communityName;
     @ApiModelProperty(name = "remake", value = "备注")
     private String remake;
 
@@ -87,6 +89,8 @@ public class ResidentialDTO {
     private String locationCode;
     @ApiModelProperty(name = "grid", value = "所属网格")
     private String grid;
+    @ApiModelProperty(name = "gridName", value = "所属网格")
+    private String gridName;
 
     public String getResidentialId() {
         return residentialId == null ? "" : residentialId.trim();
@@ -248,6 +252,14 @@ public class ResidentialDTO {
         this.community = community;
     }
 
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
+
     public String getRemake() {
         return remake == null ? "" : remake.trim();
     }
@@ -359,4 +371,12 @@ public class ResidentialDTO {
     public void setGrid(String grid) {
         this.grid = grid;
     }
+
+    public String getGridName() {
+        return gridName;
+    }
+
+    public void setGridName(String gridName) {
+        this.gridName = gridName;
+    }
 }

src/main/java/cn/com/tenlion/systemhouse/service/residential/impl/ResidentialServiceImpl.java

@@ -2,9 +2,14 @@ package cn.com.tenlion.systemhouse.service.residential.impl;
 
 import cn.com.tenlion.systemhouse.dao.residential.IResidentialDao;
 import cn.com.tenlion.systemhouse.pojo.bos.residential.ResidentialBO;
+import cn.com.tenlion.systemhouse.pojo.dtos.community.CommunityDTO;
+import cn.com.tenlion.systemhouse.pojo.dtos.grid.GridDTO;
 import cn.com.tenlion.systemhouse.pojo.dtos.residential.ResidentialDTO;
 import cn.com.tenlion.systemhouse.pojo.pos.residential.ResidentialPO;
 import cn.com.tenlion.systemhouse.pojo.vos.residential.ResidentialVO;
+import cn.com.tenlion.systemhouse.service.community.ICommunityService;
+import cn.com.tenlion.systemhouse.service.grid.IGridService;
+import cn.com.tenlion.systemhouse.service.grid.impl.GridServiceImpl;
 import cn.com.tenlion.systemhouse.service.residential.IResidentialService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.exceptions.SearchException;
@@ -36,6 +41,10 @@ public class ResidentialServiceImpl extends DefaultBaseService implements IResid
     private IResidentialDao residentialDao;
     @Autowired
     private IAreaService areaService;
+    @Autowired
+    private ICommunityService communityService;
+    @Autowired
+    private IGridService gridService;
 
     @Override
     public void save(ResidentialVO residentialVO) {
@@ -110,6 +119,16 @@ public class ResidentialServiceImpl extends DefaultBaseService implements IResid
     @Override
     public ResidentialDTO get(Map<String, Object> params) {
         ResidentialDTO residentialDTO = residentialDao.get(params);
+        if(null != residentialDTO) {
+            CommunityDTO communityDTO = communityService.get(residentialDTO.getCommunity());
+            if(null != communityDTO) {
+                residentialDTO.setCommunityName(communityDTO.getCommunityName());
+            }
+            GridDTO gridDTO = gridService.get(residentialDTO.getGrid());
+            if(null != gridDTO) {
+                residentialDTO.setGridName(gridDTO.getGridName());
+            }
+        }
         /*if(null != residentialDTO) {
             AreaDTO area1DTO = getAreaMsg(residentialDTO.getArea1Id());
             residentialDTO.setArea1Lng(area1DTO.getAreaLng());
@@ -167,7 +186,16 @@ public class ResidentialServiceImpl extends DefaultBaseService implements IResid
 
     @Override
     public List<ResidentialDTO> list(Map<String, Object> params) {
-        return residentialDao.list(params);
+        List<ResidentialDTO> residentialDTOList =residentialDao.list(params);
+        if(null != residentialDTOList && residentialDTOList.size() > 0) {
+            for(ResidentialDTO residentialDTO: residentialDTOList) {
+                CommunityDTO communityDTO = communityService.get(residentialDTO.getCommunity());
+                if(null != communityDTO) {
+                    residentialDTO.setCommunityName(communityDTO.getCommunityName());
+                }
+            }
+        }
+        return residentialDTOList;
     }
 
     @Override

src/main/resources/templates/residential/save.html

@@ -122,7 +122,7 @@
                         <div id="remake"></div>
                     </div>
                 </div>
-                <div class="layui-row" id="mapDiv" style="display: none;">
+                <div class="layui-row" id="mapDiv">
                     <div class="layui-col-md12 layui-col-sm12" style="padding: 0 0px;">
                         <div id="mapContainer" style="width: 100%;height: 350px;"></div>
                     </div>

src/main/resources/templates/residential/update.html

@@ -122,7 +122,7 @@
                         <div id="remake"></div>
                     </div>
                 </div>
-                <div class="layui-row" id="mapDiv" style="display: none;">
+                <div class="layui-row" id="mapDiv">
                     <div class="layui-col-md12 layui-col-sm12" style="padding: 0 0px;">
                         <div id="mapContainer" style="width: 100%;height: 350px;"></div>
                     </div>