diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java index 1677dc8f76..fc651f6c37 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java @@ -83,6 +83,13 @@ public interface CustomerGridDao extends BaseDao { **/ List selectListGridInfo(String customerId); + /** + * 查询网格id + * @param gridId + * @return + */ + GridInfoDTO selectGridInfo(String gridId); + /** * 查询工作人员网格关系 * @author zhaoqifeng diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java index 7215caaa8d..34368a57b8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java @@ -129,6 +129,14 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr user.setOrgName(gridInfo.getOrgName()); //原始数据Pid使用英文:隔开,大屏数据要求按照英文,隔开 user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA)); + }else{ + //如果网格删了或者组织删了,重新查询一下吧 + GridInfoDTO grid = customerGridService.queryGridInfoDTO(user.getGridId()); + user.setGridName(grid.getGridName()); + user.setOrgId(grid.getAgencyId()); + user.setOrgName(grid.getOrgName()); + //原始数据Pid使用英文:隔开,大屏数据要求按照英文,隔开 + user.setAllParentIds(grid.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA)); } Integer point = pointMap.get(user.getUserId()); BigDecimal score = scoreMap.get(user.getUserId()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java index d4aedd0ba2..5894fafa1b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java @@ -57,6 +57,13 @@ public interface CustomerGridService extends BaseService { **/ List queryGridInfoList(String customerId); + /** + * 查询网格信息 + * @param gridId + * @return + */ + GridInfoDTO queryGridInfoDTO(String gridId); + /** * 查询工作人员网格关系 * @author zhaoqifeng diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java index 956c5990bc..9abd714221 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java @@ -76,6 +76,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl + + + +