From 202d22e67ac0b9b1a2bcbaa21c9836cd2125c51b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 19 Aug 2021 09:57:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1org-day=E5=8D=95=E5=AE=A2=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java  | 5 +++++
 .../epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java   | 5 +++++
 .../epmet/dto/screen/result/CategoryProjectResultDTO.java    | 5 +++++
 .../screen/ScreenProjectCategoryOrgDailyEntity.java          | 5 +++++
 .../extract/FactOriginProjectCategoryDailyDao.xml            | 1 +
 .../screen/ScreenProjectCategoryGridDailyDao.xml             | 1 +
 .../screen/ScreenProjectCategoryOrgDailyDao.xml              | 1 +
 7 files changed, 23 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
index b80df7b7ff..cd31f554bb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
@@ -43,6 +43,11 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 分类来源客户ID
+     */
+	private String categoryOriginCustomerId;
+
     /**
      * 日期yyyyMMdd
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
index 117db2716c..368d95f6a2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
@@ -43,6 +43,11 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 分类来源客户ID
+     */
+    private String categoryOriginCustomerId;
+
     /**
      * 日期yyyyMMdd
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
index 2ed95c1a35..48af51b5ef 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
@@ -27,6 +27,11 @@ public class CategoryProjectResultDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 分类来源客户ID
+     */
+    private String categoryOriginCustomerId;
+
     /**
      * 分类码
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
index 5591e797cd..bdfba9bbc6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
@@ -42,6 +42,11 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 分类来源客户ID
+	 */
+	private String categoryOriginCustomerId;
+
     /**
      * 日期yyyyMMdd
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
index 1ed0c4d8c2..2a466396bd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
@@ -69,6 +69,7 @@
     <select id="selectListProjectCategoryByOrg" resultType="com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO">
         SELECT
             c.CUSTOMER_ID,
+            c.CUSTOMER_ID AS categoryOriginCustomerId,
             c.CATEGORY_CODE,
             c.`LEVEL`,
             p.AGENCY_ID AS orgId,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
index ba818db4ef..8ec1fcc4bd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
@@ -17,6 +17,7 @@
             sca.PID,
             sca.pids,
             sg.CUSTOMER_ID,
+            sg.CUSTOMER_ID AS categoryOriginCustomerId,
             sg.CATEGORY_CODE,
             SUM(sg.PROJECT_TOTAL) AS projectTotal,
             sg.level,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index ff969ef456..ee315861d6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -29,6 +29,7 @@
             IFNULL(sca.PID,'0') AS pid,
             IFNULL(sca.PIDS,'0') AS pids,
             sa.CUSTOMER_ID,
+            sa.CATEGORY_ORIGIN_CUSTOMER_ID,
             sa.CATEGORY_CODE,
             SUM(sa.PROJECT_TOTAL) AS projectTotal,
             sa.level,

From 80f9bce38051d5246745f037d53456a087308998 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 19 Aug 2021 11:01:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E5=AE=A2=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenProjectCategoryOrgDailyDao.java     | 12 ++++-
 ...eenProjectCategoryOrgDailyServiceImpl.java | 17 +++---
 .../ScreenProjectCategoryOrgDailyDao.xml      | 53 +++++++++++++++++++
 3 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index d591f56b2b..d5336c4a34 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -65,7 +65,17 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	 */
 	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfo(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
 																	 @Param("level")String level, @Param("customerId")String customerId, @Param("existsStatus")Boolean existsStatus);
-
+	/**
+	 * @Description  查询组织分类信息【多客户】升级版
+	 * @Param customerIds
+	 * @Param dateId
+	 * @Param level
+	 * @Param customerId
+	 * @author zxc
+	 * @date 2021/8/19 10:40 上午
+	 */
+	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfoPlus(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+																	 @Param("level")String level, @Param("customerId")String customerId);
 	/**
 	 * @Description  根据客户ID，天ID，组织ID删除旧数据
 	 * @Param customerId
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 14402b1f86..2c0f82343b 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
@@ -187,6 +187,10 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
              * 2.查询子客户的分类标签，把子客户分类标签一样的累加
              * 3.子客户累加后的跟父客户对比 categoryCode，一样累加到父客户，不一样直接添加到父客户，agencyId一并改为父客户的
              * 4.父客户数据处理好，在存储一套子客户数据
+             *
+             *
+             * 2021-08-19新注释新修改
+             * 利用 EPMET_CATEGORY_CODE把外部客户的分类计算到内部客户
              */
             disposeMoreCustomer(customerId,dateId,relationInfo);
         }
@@ -399,16 +403,9 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, true);
                 // 父客户不存在的分类
                 List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
-                // 子级客户的分类标签数据
-                List<CategoryProjectResultDTO> sonResult = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(categoryProjectExists)){
-                    categoryProjectResultDTOS.addAll(categoryProjectExists);
-                    sonResult.addAll(categoryProjectExists);
-                }
-                if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
-                    categoryProjectResultDTOS.addAll(categoryProjectNotExists);
-                    sonResult.addAll(categoryProjectNotExists);
-                }
+                // 外部客户所有分类 = 父客户存在的分类 + 父客户不存在的分类
+                List<CategoryProjectResultDTO> sonResult = baseDao.selectOrgCategoryMoreCustomerInfoPlus(customerIds, dateId, level, customerId);
+                categoryProjectResultDTOS.addAll(sonResult);
                 // 此时的 'categoryProjectResultDTOS' 等于 父子客户所有的分类标签
                 Map<String, List<CategoryProjectResultDTO>> groupByCategoryCode = categoryProjectResultDTOS.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getCategoryCode));
                 // 这时的result集合要清空,因为被上边使用 【result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);】
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index ee315861d6..aef217b483 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -102,4 +102,57 @@
         GROUP BY od.CATEGORY_CODE
     </select>
 
+    <!-- 查询组织分类信息【多客户】升级版 -->
+    <select id="selectOrgCategoryMoreCustomerInfoPlus" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+            IF(od.pid = '0', od.ORG_ID,od.pid) AS orgId,
+            IFNULL(sca.PID,'0') AS pid,
+            IFNULL(sca.PIDS,'0') AS pids,
+            #{customerId} as customerId,
+            od.level,
+            #{level} as orgType,
+            cd.EPMET_CATEGORY_CODE AS categoryCode,
+            SUM(od.PROJECT_TOTAL) AS projectTotal,
+            od.DATE_ID
+        FROM screen_project_category_org_daily od
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.PID
+        WHERE 1=1
+          AND od.DEL_FLAG = '0'
+          AND  od.CUSTOMER_ID IN (
+              <foreach collection="customerIds" item="customer" separator=",">
+                  #{customer}
+              </foreach>
+            )
+          AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+          AND od.pid = '0'
+          AND od.date_id = #{dateId}
+        GROUP BY od.CATEGORY_CODE,od.pid
+        UNION ALL
+        SELECT
+            IF(od.pid = '0', od.ORG_ID,od.pid) AS orgId,
+            IFNULL(sca.PID,'0') AS pid,
+            IFNULL(sca.PIDS,'0') AS pids,
+            #{customerId} as customerId,
+            od.level,
+            #{level} as orgType,
+            od.CATEGORY_CODE AS categoryCode,
+            SUM(od.PROJECT_TOTAL) AS projectTotal,
+            od.DATE_ID
+        FROM screen_project_category_org_daily od
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.PID
+        WHERE 1=1
+          AND od.DEL_FLAG = '0'
+          AND  od.CUSTOMER_ID IN (
+            <foreach collection="customerIds" item="customer" separator=",">
+                #{customer}
+            </foreach>
+        )
+          AND cd.EPMET_CATEGORY_CODE IS NULL
+          AND od.pid = '0'
+          AND od.date_id = #{dateId}
+        GROUP BY od.CATEGORY_CODE,od.pid
+    </select>
+
 </mapper>
\ No newline at end of file