From f2f79f69430e7875f4b34b5ebd4a1d46eb60da2d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Jun 2021 10:33:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/basereport/form/AgencyProjectFormDTO.java  | 3 +--
 .../src/main/resources/mapper/stats/BaseReportDao.xml        | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
index d5a71d43f3..698e25306e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
@@ -24,8 +24,7 @@ public class AgencyProjectFormDTO implements Serializable {
     private List<DataList> dataList;
 
     @Data
-    public class DataList implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class DataList{
 
         /**
          * 客户Id 【dim_customer.id】
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml
index 147bbd845d..b63c8e8d5f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml
@@ -167,7 +167,8 @@
     <!-- 批量新增组织项目数据 -->
     <insert id="insertAgencyProject">
         INSERT INTO fact_agency_project_daily
-            (REPLACE(UUID(), '-', ''),
+            (
+            ID,
             CUSTOMER_ID,
             AGENCY_ID,
             PARENT_ID,
@@ -199,7 +200,7 @@
             values
         <foreach collection="list" item="i" separator=",">
             (
-            id
+            REPLACE(UUID(), '-', ''),
             #{i.customerId},
             #{i.agencyId},
             #{i.parentId},