Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

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

@@ -156,6 +156,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
 
     /**
      * @Description  按组织计算分类统计项目数量
+     * 查询sql以pid为orgId，pid的parentAgencyId为pid
      * @Param customerId
      * @Param dateId
      * @author zxc
@@ -170,6 +171,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
             disposeOneCustomer(customerId, dateId);
         }else {
             // 多客户
+            /**
+             * 1.查自己客户分类标签统计
+             * 2.查询子级客户分类标签【分为 epmet_category_code is null 和 is not null】，pid = '0'，跟父客户对比，同类标签项目数累加，不同直接添加到父客户
+             * 注：加入直属网格
+             */
             disposeMoreCustomer(customerId,dateId,relationInfo);
         }
     }
@@ -288,9 +294,20 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }
     }
 
+    /**
+     * @Description  多客户处理
+     * @Param level 级别
+     * @Param isGrid
+     * @Param customerId
+     * @Param dateId
+     * @Param relationInfo 子级客户信息
+     * @author zxc
+     * @date 2021/3/25 下午1:29
+     */
     private void disposeMoreCustomerSub(String level,Boolean isGrid,String customerId, String dateId, List<CustomerRelationEntity> relationInfo){
         List<ScreenProjectCategoryOrgDailyEntity> result = new ArrayList<>();
         if (isGrid){
+            // community级别走这
             List<CategoryProjectResultDTO> categoryInfos = gridDailyDao.selectCategoryInfo(customerId, dateId,null,null);
             if (!CollectionUtils.isEmpty(categoryInfos)){
                 result = ConvertUtils.sourceToTarget(categoryInfos, ScreenProjectCategoryOrgDailyEntity.class);

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml

@@ -113,7 +113,7 @@
         SELECT
             ID,
             TAG_NAME,
-            IFNULL(tag.CATEGORY_ID,'customize') AS categoryId,
+            IFNULL(CATEGORY_ID,'customize') AS categoryId,
             IS_DEFAULT,
             (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
             IS_DISABLE