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},