事件分类统计org-day单客户修改

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
      */

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
      */

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;
+
     /**
      * 分类码
      */

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
      */

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,

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,

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,