From 8852ce3ebda4b83556ee6be012adc4b0e5b43561 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 15 Oct 2021 23:05:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20dim=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0code=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/ScreenCustomerAgencyEntity.java  | 2 ++
 .../evaluationindex/screen/ScreenCustomerGridEntity.java    | 2 ++
 .../java/com/epmet/entity/org/CustomerAgencyEntity.java     | 2 ++
 .../main/java/com/epmet/entity/org/CustomerGridEntity.java  | 2 ++
 .../main/java/com/epmet/entity/stats/DimAgencyEntity.java   | 2 ++
 .../src/main/java/com/epmet/entity/stats/DimGridEntity.java | 2 ++
 .../screen/impl/ScreenCustomerAgencyServiceImpl.java        | 2 ++
 .../screen/impl/ScreenCustomerGridServiceImpl.java          | 2 ++
 .../java/com/epmet/service/impl/StatsDimServiceImpl.java    | 2 ++
 .../com/epmet/service/stats/impl/DimAgencyServiceImpl.java  | 3 +++
 .../evaluationindex/screen/ScreenCustomerAgencyDao.xml      | 2 ++
 .../mapper/evaluationindex/screen/ScreenCustomerGridDao.xml | 6 ++++--
 .../src/main/resources/mapper/org/CustomerGridDao.xml       | 1 +
 .../main/resources/mapper/org/StatsCustomerAgencyDao.xml    | 1 +
 .../src/main/resources/mapper/stats/DimAgencyDao.xml        | 2 ++
 .../src/main/resources/mapper/stats/DimGridDao.xml          | 4 +++-
 16 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java
index ba06221d17..cf7f550d7a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java
@@ -88,6 +88,8 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity {
      */
 	private String level;
 
+	private String code;
+
     /**
 	 * 行政地区编码
 	 */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
index 4a0d8e53c8..cbe1c62956 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
@@ -92,4 +92,6 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
+
+	private String code;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
index f521f0aa60..e3ea7f6109 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
@@ -69,6 +69,8 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
      */
 	private String level;
 
+	private String code;
+
     /**
      * 地区编码
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
index dc760a4b5e..ba86713249 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
@@ -55,6 +55,7 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 */
 	private String latitude;
 
+	private String code;
 	/**
 	 * 所属地区码（所属组织地区码）
 	 */
@@ -84,4 +85,5 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 * 是否同步到统计库和指标库,1同步。0不同步
 	 */
 	private String syncFlag;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java
index 411c633990..93ce0f0bfc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java
@@ -76,4 +76,6 @@ public class DimAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String level;
 
+	private String code;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
index 8c49f7f9d9..2d3fc94740 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
@@ -57,4 +57,6 @@ public class DimGridEntity extends BaseEpmetEntity {
      */
 	private String areaCode;
 
+	private String code;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
index 16ba642e62..20d242bb29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@@ -141,6 +141,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
                     }
                     exists.setAllParentNames(e.getAllParentName());
                     exists.setParentAreaCode(e.getParentAreaCode());
+                    exists.setCode(e.getCode());
                     updateAgency(exists);
                 }
             }
@@ -243,6 +244,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
         cae.setPids(e.getPids());
         cae.setSourceType(OrgSourceTypeConstant.INTERNAL);
         cae.setParentAreaCode(e.getParentAreaCode());
+        cae.setCode(e.getCode());
         screenCustomerAgencyDao.insert(cae);
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index 1ae24e2d25..f4bba9b2a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -83,6 +83,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 insertOne.setParentAgencyId(grid.getPid());
                 insertOne.setSourceType(OrgSourceTypeConstant.INTERNAL);
                 insertOne.setAreaCode(grid.getAreaCode());
+                insertOne.setCode(grid.getCode());
                 screenCustomerGridDao.insert(insertOne);
             }
         }
@@ -97,6 +98,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 screenGrid.setDataEndTime(dateStr);
                 screenGrid.setGridName(grid.getGridName());
                 screenGrid.setAreaCode(grid.getAreaCode());
+                screenGrid.setCode(grid.getCode());
                 screenCustomerGridDao.updateById(screenGrid);
 
                 if ("1".equals(grid.getDelFlag())) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
index 09db5e717d..2002b545a8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
@@ -106,6 +106,7 @@ public class StatsDimServiceImpl implements StatsDimService {
                     dimGrid.setGridName(updatedGrid.getGridName());
                     dimGrid.setUpdatedTime(now);
                     dimGrid.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                    dimGrid.setCode(updatedGrid.getCode());
                     dimGrids.add(dimGrid);
                 }
             }
@@ -134,6 +135,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             dimGrid.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
             dimGrid.setCreatedTime(initTime);
             dimGrid.setUpdatedTime(initTime);
+            dimGrid.setCode(grid.getCode());
             return dimGrid;
         }).collect(Collectors.toList());
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
index f0f530fa4f..c1ab8fb3d0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
@@ -141,6 +141,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
                 existsDimAgency.setAgencyName(agency.getOrganizationName());
                 existsDimAgency.setUpdatedTime(initTime);
                 existsDimAgency.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                existsDimAgency.setCode(agency.getCode());
                 baseDao.updateById(existsDimAgency);
             }
         }
@@ -150,6 +151,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
 
     public void initAgencyAllDim(CustomerAgencyEntity agency, Date initTime) {
         DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
+        dimAgencyEntity.setCode(agency.getCode());
         dimAgencyEntity.setAgencyName(agency.getOrganizationName());
         dimAgencyEntity.setAllParentName(agency.getAllParentName());
         dimAgencyEntity.setCustomerId(agency.getCustomerId());
@@ -172,6 +174,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
     public void initAgencySelfDim(CustomerAgencyEntity agency, Date initTime) {
         DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
         dimAgencyEntity.setAgencyName(agency.getOrganizationName());
+        dimAgencyEntity.setCode(agency.getCode());
         dimAgencyEntity.setAllParentName(agency.getAllParentName());
         dimAgencyEntity.setCustomerId(agency.getCustomerId());
         dimAgencyEntity.setLevel(agency.getLevel());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index 1b90262608..12ccf09ab0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -203,6 +203,7 @@
                center_mark,
                party_mark,
                level,
+               code,
                area_code,
                del_flag,
                revision,
@@ -231,6 +232,7 @@
                center_mark,
                party_mark,
                level,
+               code,
                area_code,
                del_flag,
                revision,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
index 71ae010181..fd05c3968d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
@@ -179,7 +179,8 @@
                updated_by,
                updated_time,
                data_end_time,
-               all_parent_ids
+               all_parent_ids,
+               code
         from screen_customer_grid
         where DEL_FLAG = 0 and SOURCE_TYPE='internal'
         order by CREATED_TIME desc
@@ -204,7 +205,8 @@
                updated_by,
                updated_time,
                data_end_time,
-               all_parent_ids
+               all_parent_ids,
+               code
         from screen_customer_grid
         where DEL_FLAG = 0 and SOURCE_TYPE='internal'
         order by UPDATED_TIME desc
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index d84d884cb3..64fa329ab6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -54,6 +54,7 @@
         grid_name,
         longitude,
         latitude,
+        code,
         area_code,
         del_flag,
         revision,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index f7fe07a1a8..a79160f731 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -85,6 +85,7 @@
             all_parent_name,
             organization_name,
             level,
+            code,
             area_code,
             del_flag,
             revision,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
index 6881886600..ee39331a23 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
@@ -263,6 +263,7 @@
         SELECT id,
                agency_name,
                customer_id,
+               code,
                pid,
                pids,
                all_parent_name,
@@ -284,6 +285,7 @@
         select id,
                agency_name,
                customer_id,
+               code,
                pid,
                pids,
                all_parent_name,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
index d7a33deb51..13c07b8112 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
@@ -58,13 +58,15 @@
                grid_name,
                customer_id,
                agency_id,
+               code,
                area_code,
                del_flag,
                revision,
                created_by,
                created_time,
                updated_by,
-               updated_time
+               updated_time,
+               code
         from dim_grid
         order by UPDATED_TIME desc
         limit 1;

From 1e36a99f81a07df177351a9ac6acb174d3d444c7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 18 Oct 2021 09:50:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=88=AA=E5=8F=96?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FactOriginProjectCategoryDailyServiceImpl.java       | 4 ++--
 .../screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
index bf25a0c519..083fe26a85 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
@@ -144,9 +144,9 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
 
     public Integer getSubCount(String customerId){
         Integer result = NumConstant.FOUR;
-        /*if (customerId.equals(PingYinConstant.TEST_PING_YIN_CUSTOMER_ID) || customerId.equals(PingYinConstant.PROD_PING_YIN_CUSTOMER_ID)){
+        if (customerId.equals(PingYinConstant.TEST_PING_YIN_CUSTOMER_ID) || customerId.equals(PingYinConstant.PROD_PING_YIN_CUSTOMER_ID)){
             return NumConstant.TWO;
-        }*/
+        }
         return result;
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index 1a4085042c..edd13b8e7d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -496,7 +496,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
             // 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.FOUR);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO);
             log.info("直接立项的统计:"+screenProjectCategory);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {