如果没有区划 则默认暂时不显示

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java

@@ -89,15 +89,20 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity {
 	private String level;
 
     /**
-     * 行政地区编码
+	 * 行政地区编码
-     */
+	 */
 	private String areaCode;
 
 	private String sourceType;
 
-    /**
+	/**
-     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+	 * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
-     */
+	 */
 	private String dataEndTime;
 
+	/**
+	 * desc: 是否显示 1显示 0不显示
+	 */
+	private String isDisplay;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -131,6 +132,12 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
                     exists.setLevel(e.getLevel());
                     exists.setDataEndTime(dateEndTime);
                     exists.setAreaCode(e.getAreaCode());
+                    //如果没有区划 则默认暂时不显示
+                    if (StringUtils.isEmpty(e.getAreaCode())) {
+                        exists.setIsDisplay(NumConstant.ZERO_STR);
+                    } else {
+                        exists.setIsDisplay(NumConstant.ONE_STR);
+                    }
                     exists.setAllParentNames(e.getAllParentName());
                     updateAgency(exists);
                 }
@@ -221,6 +228,12 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
         cae.setAllParentNames(e.getAllParentName());
         cae.setAreaCode(e.getAreaCode());
         //cae.setAreaMarks(e);
+        //如果没有区划 则默认暂时不显示
+        if (StringUtils.isEmpty(e.getAreaCode())) {
+            cae.setIsDisplay(NumConstant.ZERO_STR);
+        } else {
+            cae.setIsDisplay(NumConstant.ONE_STR);
+        }
         cae.setCustomerId(e.getCustomerId());
         cae.setDataEndTime(dateEndTime);
         cae.setLevel(e.getLevel());