diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
index 38094a105a..75eb13a0fa 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
@@ -48,4 +48,9 @@ public class CustomerGridFormDTO implements Serializable {
* 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
*/
private String dataEndTime;
+
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
index 7d136c4b27..e446e073a3 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
@@ -94,9 +94,13 @@ public class DifficultyDataFormDTO implements Serializable {
*/
private Integer eventHandledCount;
-
/**
* 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
*/
private String dataEndTime;
+
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
index 21e8ee718e..6c2cbe43a5 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
@@ -121,4 +121,9 @@ public class EventDataFormDTO implements Serializable {
* 数据更新至: yyyy|yyyMM|yyyyMMdd 8.21增加字段
*/
private String dataEndTime;
+
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
index 8b0a753839..5e962e47bb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
@@ -79,4 +79,9 @@ public class OrgRankDataFormDTO implements Serializable {
* 满意率,最大值100,保留小数点后四位
*/
private BigDecimal satisfactionRatio;
+
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
index 29b35aa147..5d9f5da32b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
@@ -73,4 +73,9 @@ public class PartyUserRankDataFormDTO implements Serializable {
* 名
*/
private String name;
+
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java
index 99b6c99553..62dddc6960 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java
@@ -78,4 +78,8 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
*/
private String dataEndTime;
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
index 845bbb7db0..9a4d3af36b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
@@ -127,4 +127,8 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
*/
private String dataEndTime;
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
index e666f852b0..0242ab8ce2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
@@ -144,4 +144,8 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
*/
private String dataEndTime;
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java
index a732eda4b9..abbdbb7d20 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java
@@ -109,4 +109,8 @@ public class ScreenOrgRankDataEntity extends BaseEpmetEntity {
*/
private BigDecimal satisfactionRatio;
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java
index 702e184439..c542da7085 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java
@@ -98,4 +98,8 @@ public class ScreenPartyUserRankDataEntity extends BaseEpmetEntity {
*/
private String dataEndTime;
+ /**
+ * 所有上级ID,用英文逗号分开(8.26新增)
+ */
+ private String allParentIds;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 5381e9ddd2..9a37bd23c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -29,7 +29,8 @@
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME,
- DATA_END_TIME
+ DATA_END_TIME,
+ ALL_PARENT_IDS
) values
(
@@ -47,7 +48,8 @@
now(),
'APP_USER',
now(),
- #{item.dataEndTime}
+ #{item.dataEndTime},
+ #{item.allParentIds}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index e26c43115c..fb9a087e42 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -35,7 +35,8 @@
UPDATED_BY,
UPDATED_TIME,
LATEST_OPERATE_DESC,
- DATA_END_TIME
+ DATA_END_TIME,
+ ALL_PARENT_IDS
) values
(
@@ -63,7 +64,8 @@
'APP_USER',
now(),
#{item.latestOperateDesc},
- #{item.dataEndTime}
+ #{item.dataEndTime},
+ #{item.allParentIds}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index be95b118df..9c950e18e1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -38,7 +38,8 @@
EVENT_STATUS_CODE,
EVENT_STATUS_DESC,
LATEST_OPERATE_DESC,
- DATA_END_TIME
+ DATA_END_TIME,
+ ALL_PARENT_IDS
) values
(
@@ -69,7 +70,8 @@
#{item.eventStatusCode},
#{item.eventStatusDesc},
#{item.latestOperateDesc},
- #{item.dataEndTime}
+ #{item.dataEndTime},
+ #{item.allParentIds}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 4ebe5e2c28..345deacd5d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -35,7 +35,8 @@
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
- UPDATED_TIME
+ UPDATED_TIME,
+ ALL_PARENT_IDS
) values
(
@@ -59,7 +60,8 @@
'APP_USER',
now(),
'APP_USER',
- now()
+ now(),
+ #{item.allParentIds}
)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 070e952878..cf93e38a5f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -29,7 +29,8 @@
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME,
- DATA_END_TIME
+ DATA_END_TIME,
+ ALL_PARENT_IDS
) values
(
@@ -51,7 +52,8 @@
now(),
'APP_USER',
now(),
- #{item.dataEndTime}
+ #{item.dataEndTime},
+ #{item.allParentIds}
)