Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java

@@ -15,4 +15,7 @@ public interface PingYinConstant {
 
     String YU_SHAN_AGENCY_ID = "1258587398679126017";
     String YU_SHAN_CUSTOMER_ID = "a4bbf298d8e427844038cee466f022ef";
+
+    String TEST_PING_YIN_CUSTOMER_ID = "78e2b2227c07de1fe54da14e2b2d9eb6";
+    String PROD_PING_YIN_CUSTOMER_ID = "6f203e30de1a65aab7e69c058826cd80";
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -935,7 +935,7 @@ public class DemoController {
             paramDTO.setCustomerId(customerId);
             paramDTO.setDateId(formDTO.getDateId());
             originProjectCategoryDailyService.extractProjectCategory(paramDTO);
-            log.error(String.format("/data/stats/demo/extractProjectCategory,fact_origin_project_category_daily表抽取完毕,customerId:%s", customerId));
+            log.warn(String.format("/data/stats/demo/extractProjectCategory,fact_origin_project_category_daily表抽取完毕,customerId:%s", customerId));
         }
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java

@@ -42,7 +42,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @description 计算当前客户下，各个网格内，各项目分类下项目数量
      * @Date 2021/3/23 9:58
      **/
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount);
 
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
@@ -50,7 +50,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,@Param("subCount") Integer subCount);
 
     int deleteByProjectIds(@Param("list") List<String> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java

@@ -54,5 +54,5 @@ public interface FactOriginProjectCategoryDailyService extends BaseService<FactO
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java

@@ -23,6 +23,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.PingYinConstant;
+import com.epmet.constant.PingYinConstants;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -136,10 +138,18 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      **/
     @Override
     public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId) {
-        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId);
+        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId));
         return list;
     }
 
+    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)){
+            return NumConstant.TWO;
+        }*/
+        return result;
+    }
+
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
      * @Param orgIds
@@ -147,10 +157,10 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      * @date 2021/4/13 下午4:36
      */
     @Override
-    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId) {
+    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount) {
         if (!CollectionUtils.isEmpty(orgIds)){
             return new ArrayList<>();
         }
-        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId);
+        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -197,7 +197,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			}
 		}
 
-		log.error(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
+		log.warn(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
 	}
 
 	/**

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

@@ -280,7 +280,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         // 组织项目分类 项目数
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)){
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR);
             if (!CollectionUtils.isEmpty(result)){
                 if (!CollectionUtils.isEmpty(screenProjectCategory)){
                     result.forEach(r -> {
@@ -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);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.FOUR);
             log.info("直接立项的统计:"+screenProjectCategory);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {
@@ -567,4 +567,4 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }while (row > NumConstant.ZERO && row == NumConstant.ONE_THOUSAND);
     }
 
-}
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml

@@ -55,7 +55,7 @@
                 union all
             SELECT
                 c.CUSTOMER_ID,
-                left(c.CATEGORY_CODE, 4) as CATEGORY_CODE,
+                left(c.CATEGORY_CODE, #{subCount}) as CATEGORY_CODE,
                 '1'as `LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
@@ -70,7 +70,7 @@
                 AND c.CUSTOMER_ID = #{customerId}
             GROUP BY
                 c.CUSTOMER_ID,
-                left(c.CATEGORY_CODE, 4),
+                left(c.CATEGORY_CODE, #{subCount}),
                 c.`LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID,
@@ -104,7 +104,7 @@
         SELECT
             c.CUSTOMER_ID,
             c.CUSTOMER_ID AS categoryOriginCustomerId,
-            left(c.CATEGORY_CODE, 4) AS CATEGORY_CODE,
+            left(c.CATEGORY_CODE, #{subCount}) AS CATEGORY_CODE,
             '1' AS `LEVEL`,
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
@@ -120,6 +120,6 @@
               </foreach>
           )
          AND p.GRID_ID = ''
-        GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, 4), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
+        GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, #{subCount}), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
     </select>
 </mapper>