Merge branch 'dev_grid_platform' into dev

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

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -198,8 +199,22 @@ public class DataReportingServiceImpl implements DataReportingService {
 					"46c55cb862d6d5e6d05d2ab61a1cc07e".equals(project.getCustomerId())) {
 			CustomerProjectCategoryDictEntity categoryEntity = codeMap.get(categoryCode);
 			if (null != categoryEntity) {
-				categoryCode = categoryEntity.getEpmetCategoryCode();
-				parentCode = null == epmetCodeMap.get(categoryCode)?null:epmetCodeMap.get(categoryCode).getParentCategoryCode();
+				String code = categoryEntity.getEpmetCategoryCode();
+				if (StringUtils.isBlank(code)) {
+					//没有对应平阴的分类code，那么一级分类和二级分类都为空
+					categoryCode = null;
+					parentCode = null;
+				} else {
+					//如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类
+					CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code);
+					if (NumConstant.ONE == epmetCode.getLevel()) {
+						categoryCode = null;
+						parentCode = code;
+					} else {
+						categoryCode = code;
+						parentCode = epmetCode.getParentCategoryCode();
+					}
+				}
 			} else {
 				categoryCode = null;
 				parentCode = null;