From 291c469c7ba439ea87db72da0ec3103e6fc98ba3 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Mar 2021 15:16:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...creenProjectCategoryOrgDailyServiceImpl.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 4fced8e2ee..8dbbe72d73 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
@@ -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);

From 43b9772fd96dcf9efdab92a82e219d0c7dc1a925 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 15:22:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index d23b67ac1d..ca8b48d0c7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/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