Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -156,13 +156,17 @@ public class DataReportingServiceImpl implements DataReportingService {
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
-					dto.setOrgCode(agency.getCode());
+					if (null != agency) {
-					dto.setOrgName(agency.getAgencyName());
+						dto.setOrgCode(agency.getCode());
+						dto.setOrgName(agency.getAgencyName());
+					}
 				} else {
 					ScreenCustomerGridDTO grid = screenCustomerGridService.getGridById(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
-					dto.setOrgCode(grid.getCode());
+					if (null != grid) {
-					dto.setOrgName(grid.getGridName());
+						dto.setOrgCode(grid.getCode());
+						dto.setOrgName(grid.getGridName());
+					}
 				}
 				return dto;
 			}).collect(Collectors.toList());
@@ -175,13 +179,17 @@ public class DataReportingServiceImpl implements DataReportingService {
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = agencyMap.get(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
-					dto.setOrgCode(agency.getCode());
+					if (null != agency) {
-					dto.setOrgName(agency.getAgencyName());
+						dto.setOrgCode(agency.getCode());
+						dto.setOrgName(agency.getAgencyName());
+					}
 				} else {
 					ScreenCustomerGridDTO grid = gridMap.get(project.getOrgId());
 					dto.setOrgId(project.getOrgId());
-					dto.setOrgCode(grid.getCode());
+					if (null != grid) {
-					dto.setOrgName(grid.getGridName());
+						dto.setOrgCode(grid.getCode());
+						dto.setOrgName(grid.getGridName());
+					}
 				}
 				return dto;
 			}).collect(Collectors.toList());
@@ -237,16 +245,18 @@ public class DataReportingServiceImpl implements DataReportingService {
 			if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) {
 				//如果是孔村的项目办结层级需要降一级
 				if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
-					switch (project.getFinishOrgLevel()) {
+					if (StringUtils.isNotBlank(project.getFinishOrgLevel())) {
-						case OrgTypeConstant.DISTRICT:
+						switch (project.getFinishOrgLevel()) {
-							dto.setCompleteLevel("3");
+							case OrgTypeConstant.DISTRICT:
-							break;
+								dto.setCompleteLevel("3");
-						case OrgTypeConstant.STREET:
+								break;
-						case OrgTypeConstant.COMMUNITY:
+							case OrgTypeConstant.STREET:
-							dto.setCompleteLevel("4");
+							case OrgTypeConstant.COMMUNITY:
-							break;
+								dto.setCompleteLevel("4");
-						default:
+								break;
-							break;
+							default:
+								break;
+						}
 					}
 				} else {
 					dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel()));
@@ -256,7 +266,9 @@ public class DataReportingServiceImpl implements DataReportingService {
 				String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON);
 				int size = orgIds.length;
 				ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(orgIds[size - 1]);
-				dto.setCompleteLevel(getCompleteLevel(agency.getLevel()));
+				if (null != agency) {
+					dto.setCompleteLevel(getCompleteLevel(agency.getLevel()));
+				}
 			} else {
 				//办结组织是网格时，办结层级为网格
 				dto.setCompleteLevel("5");