From 3ac1a523b5cb0e7cbc5c947d6442a4d8d88e8521 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 13 Jul 2021 11:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?pid,pids=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java  | 8 ++++++++
 .../mapper/plugins/ScreenWorkRecordOrgDailyDao.xml        | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java
index f72d2f3667..ef83c2160b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java
@@ -18,6 +18,14 @@ public class ScreenWorkRecordCommonFormDTO implements Serializable {
      * 组织Id或者网格id
      */
     private String orgId;
+    /**
+     * org_id的上级
+     */
+    private String pid;
+    /**
+     * org_id的所有上级英文冒号或者顿号隔开都可
+     */
+    private String pids;
 
     /**
      * 组织名称或者网格名
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
index 9bf253e4a5..3be24445bf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
@@ -17,6 +17,8 @@
         customer_id,
         DATE_ID,
         org_id,
+        pid,
+        pids,
         org_name,
         meeting_code,
         type_code,
@@ -36,6 +38,8 @@
             #{customerId},
             #{dateId},
             #{item.orgId},
+            #{item.pid},
+            #{item.pids},
             #{item.orgName},
             #{item.meetingCode},
             #{item.typeCode},