Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

 Conflicts:

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

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;
+
     /**
 	 * 行政地区编码
 	 */

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;
 }

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;
+
     /**
      * 地区编码
      */

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;
+
 }

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;
+
 }

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;
+
 }

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;
     }
 

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

@@ -142,6 +142,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
                     }
                     exists.setAllParentNames(e.getAllParentName());
                     exists.setParentAreaCode(e.getParentAreaCode());
+                    exists.setCode(e.getCode());
                     updateAgency(exists);
 
                     // 已删除数据的处理
@@ -251,6 +252,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);
     }
 

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())) {

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)) {

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

@@ -110,6 +110,7 @@ public class StatsDimServiceImpl implements StatsDimService {
                     dimGrid.setAgencyId(updatedGrid.getPid());
                     dimGrid.setAreaCode(updatedGrid.getAreaCode());
                     dimGrid.setCustomerId(updatedGrid.getCustomerId());
+                    dimGrid.setCode(updatedGrid.getCode());
                     dimGrids.add(dimGrid);
                 }
             }
@@ -138,6 +139,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());
     }

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

@@ -146,6 +146,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
                 existsDimAgency.setPids(agency.getPids());
                 existsDimAgency.setUpdatedTime(initTime);
                 existsDimAgency.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                existsDimAgency.setCode(agency.getCode());
                 baseDao.updateById(existsDimAgency);
 
                 if ("1".equals(agency.getDelFlag())) {
@@ -159,6 +160,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());
@@ -181,6 +183,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());

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,

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

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,

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,

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,

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;