Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java

@@ -38,6 +38,17 @@ public class AgencyDistributionResultDTO implements Serializable {
      */
     private String type;
 
+    /**
+     * 若果是组织，对应返回screen_customer_agency的 level
+     * 机关级别
+     * 社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province
+     */
+    private String agencyLevel;
+
     public AgencyDistributionResultDTO() {
         this.subAreaMarks = "";
         this.subCenterMark = "";

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -32,6 +31,7 @@ public class CompartmentResultDTO implements Serializable {
     private String areaMarks = "";
 
     /**
+     * 当前组织的级别
      * 机关级别
      * 社区级：community，
      * 乡（镇、街道）级:street,
@@ -39,8 +39,7 @@ public class CompartmentResultDTO implements Serializable {
      * 市级: city
      * 省级:province
      */
-    @JsonIgnore
+    private String agencyLevel;
-    private String level;
 
     /**
      * 子级用户分布

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -195,7 +195,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
@@ -213,7 +213,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -44,7 +44,7 @@
             agency_id AS agencyId,
             agency_name AS name,
             area_marks AS areaMarks,
-            level AS level
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE
@@ -60,7 +60,8 @@
             agency_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'agency' AS type
+            'agency' AS type,
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -10,7 +10,8 @@
             grid_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'grid' AS type
+            'grid' AS type,
+            '' as agencyLevel
         FROM
             screen_customer_grid
         WHERE