|
@@ -14,7 +14,9 @@ import com.boman.domain.*;
|
|
import com.boman.domain.dto.AjaxResult;
|
|
import com.boman.domain.dto.AjaxResult;
|
|
import com.boman.domain.utils.ThreadPoolService;
|
|
import com.boman.domain.utils.ThreadPoolService;
|
|
import com.boman.system.api.RemoteDeptService;
|
|
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.CzrkMapper;
|
|
|
|
+import com.boman.web.core.mapper.GridInfoMapper;
|
|
import com.boman.web.core.utils.AuthUtils;
|
|
import com.boman.web.core.utils.AuthUtils;
|
|
import com.boman.web.core.utils.IdCardUtils;
|
|
import com.boman.web.core.utils.IdCardUtils;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -62,6 +64,9 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
@Resource
|
|
@Resource
|
|
private ICzrkJzdzService czrkJzdzService;
|
|
private ICzrkJzdzService czrkJzdzService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private GridInfoMapper gridInfoMapper;
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<Czrk> listByRlry(Czrk czrk) {
|
|
public List<Czrk> listByRlry(Czrk czrk) {
|
|
@@ -219,7 +224,18 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public Czrk selectCzrkById(Long id) {
|
|
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;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|