浏览代码

fix 常驻人口新增网格名称

tjf 3 年之前
父节点
当前提交
ed36005c75

+ 4 - 0
boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -208,6 +208,10 @@ public class Czrk extends BaseEntity{
      * 网格id
      */
     private Long gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
 
     /**
      * 是否删除 默认为 "N"

+ 17 - 1
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -14,7 +14,9 @@ import com.boman.domain.*;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.utils.ThreadPoolService;
 import com.boman.system.api.RemoteDeptService;
+import com.boman.web.core.domain.GridInfo;
 import com.boman.web.core.mapper.CzrkMapper;
+import com.boman.web.core.mapper.GridInfoMapper;
 import com.boman.web.core.utils.AuthUtils;
 import com.boman.web.core.utils.IdCardUtils;
 import com.github.pagehelper.PageHelper;
@@ -62,6 +64,9 @@ public class CzrkServiceImpl implements ICzrkService {
     @Resource
     private ICzrkJzdzService czrkJzdzService;
 
+    @Resource
+    private GridInfoMapper gridInfoMapper;
+
 
     @Override
     public List<Czrk> listByRlry(Czrk czrk) {
@@ -219,7 +224,18 @@ public class CzrkServiceImpl implements ICzrkService {
      */
     @Override
     public Czrk selectCzrkById(Long id) {
-        return czrkMapper.selectCzrkById(id);
+        Czrk czrk = czrkMapper.selectCzrkById(id);
+        if (czrk != null){
+            Long gridId = czrk.getGridId();
+            if (gridId != null){
+                GridInfo gridInfo = gridInfoMapper.selectGridInfoById(gridId);
+                if (gridInfo != null){
+                    String areaName = gridInfo.getAreaName();
+                    czrk.setGridName(areaName);
+                }
+            }
+        }
+        return czrk;
     }
 
     /**