diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java
index 5ae6aee7d..95192a24e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java
@@ -92,6 +92,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateY::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateY> yPage = rDimMonitorRateYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimMonitorRateY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimMonitorRateY> mapY = yList.stream().collect(Collectors.toMap(RDimMonitorRateY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -119,6 +120,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateM::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateM> mPage = rDimMonitorRateMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimMonitorRateM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimMonitorRateM> mapM = mList.stream().collect(Collectors.toMap(RDimMonitorRateM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -146,6 +149,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateD::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateD> dPage = rDimMonitorRateDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimMonitorRateD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimMonitorRateD> mapD = dList.stream().collect(Collectors.toMap(RDimMonitorRateD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -168,6 +173,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 2:
                 //变电站/换流站监测率（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -177,6 +183,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateY::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateY> yPage = rDimMonitorRateYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimMonitorRateY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimMonitorRateY> mapY = yList.stream().collect(Collectors.toMap(RDimMonitorRateY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -204,6 +212,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateM::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateM> mPage = rDimMonitorRateMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimMonitorRateM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimMonitorRateM> mapM = mList.stream().collect(Collectors.toMap(RDimMonitorRateM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -231,6 +240,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimMonitorRateD::getOrgId, deptCodeIds);
                         Page<RDimMonitorRateD> dPage = rDimMonitorRateDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimMonitorRateD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimMonitorRateD> mapD = dList.stream().collect(Collectors.toMap(RDimMonitorRateD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -253,6 +263,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 3:
                 //稳态指标超标或监测到暂态指标的变电站/换流站占比（%)
                 switch (dimGlobalDataParam.getDateType()) {
@@ -262,6 +273,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalY::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalY> yPage = rDimBusGlobalYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -289,6 +301,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalM::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalM> mPage = rDimBusGlobalMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -316,6 +329,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalD::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalD> dPage = rDimBusGlobalDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -338,6 +352,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 4:
                 //稳态指标超标或监测到暂态指标的变电站/换流站母线占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -347,6 +362,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalY::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalY> yPage = rDimBusGlobalYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -374,6 +390,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalM::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalM> mPage = rDimBusGlobalMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -401,6 +418,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalD::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalD> dPage = rDimBusGlobalDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -423,6 +441,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 5:
                 //稳态指标超标或监测到暂态指标的变电站/换流站平均占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -432,6 +451,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalY::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalY> yPage = rDimBusGlobalYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -459,6 +479,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalM::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalM> mPage = rDimBusGlobalMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -486,6 +507,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalD::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalD> dPage = rDimBusGlobalDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -508,6 +530,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 6:
                 //稳态指标超标或监测到暂态指标的变电站/换流站母线平均占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -517,6 +540,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalY::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalY> yPage = rDimBusGlobalYMapper.selectPage(new <RDimMonitorRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -544,6 +568,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalM::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalM> mPage = rDimBusGlobalMMapper.selectPage(new <RDimMonitorRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -571,6 +596,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusGlobalD::getOrgId, deptCodeIds);
                         Page<RDimBusGlobalD> dPage = rDimBusGlobalDMapper.selectPage(new <RDimMonitorRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -593,6 +619,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
 
             case 7:
                 //母线**指标超标占比（%）
@@ -603,6 +630,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetYPO::getOrgId, deptCodeIds).eq(RDimBusTargetYPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetYPO> yPage = rDimBusTargetYPOMapper.selectPage(new <RDimBusTargetYPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusTargetYPO> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusTargetYPO> mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -630,6 +659,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetMPO::getOrgId, deptCodeIds).eq(RDimBusTargetMPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetMPO> mPage = rDimBusTargetMPOMapper.selectPage(new <RDimBusTargetMPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusTargetMPO> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusTargetMPO> mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -657,6 +687,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetDPO::getOrgId, deptCodeIds).eq(RDimBusTargetDPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetDPO> dPage = rDimBusTargetDPOMapper.selectPage(new <RDimBusTargetDPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusTargetDPO> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusTargetDPO> mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -679,6 +711,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 8:
                 //母线**指标合格率（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -688,6 +721,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetYPO::getOrgId, deptCodeIds).eq(RDimBusTargetYPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetYPO> yPage = rDimBusTargetYPOMapper.selectPage(new <RDimBusTargetYPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusTargetYPO> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusTargetYPO> mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -715,6 +749,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetMPO::getOrgId, deptCodeIds).eq(RDimBusTargetMPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetMPO> mPage = rDimBusTargetMPOMapper.selectPage(new <RDimBusTargetMPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusTargetMPO> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusTargetMPO> mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -742,6 +778,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetDPO::getOrgId, deptCodeIds).eq(RDimBusTargetDPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetDPO> dPage = rDimBusTargetDPOMapper.selectPage(new <RDimBusTargetDPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusTargetDPO> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusTargetDPO> mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -764,6 +802,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 9:
                 //母线**指标平均超标占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -773,6 +812,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetYPO::getOrgId, deptCodeIds).eq(RDimBusTargetYPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetYPO> yPage = rDimBusTargetYPOMapper.selectPage(new <RDimBusTargetYPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusTargetYPO> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
+
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusTargetYPO> mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -800,6 +841,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetMPO::getOrgId, deptCodeIds).eq(RDimBusTargetMPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetMPO> mPage = rDimBusTargetMPOMapper.selectPage(new <RDimBusTargetMPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusTargetMPO> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusTargetMPO> mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -827,6 +869,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetDPO::getOrgId, deptCodeIds).eq(RDimBusTargetDPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetDPO> dPage = rDimBusTargetDPOMapper.selectPage(new <RDimBusTargetDPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusTargetDPO> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusTargetDPO> mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -858,6 +901,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetYPO::getOrgId, deptCodeIds).eq(RDimBusTargetYPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetYPO> yPage = rDimBusTargetYPOMapper.selectPage(new <RDimBusTargetYPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusTargetYPO> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusTargetYPO> mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -885,6 +929,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetMPO::getOrgId, deptCodeIds).eq(RDimBusTargetMPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetMPO> mPage = rDimBusTargetMPOMapper.selectPage(new <RDimBusTargetMPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusTargetMPO> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusTargetMPO> mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -912,6 +957,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusTargetDPO::getOrgId, deptCodeIds).eq(RDimBusTargetDPO::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimBusTargetDPO> dPage = rDimBusTargetDPOMapper.selectPage(new <RDimBusTargetDPO>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusTargetDPO> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusTargetDPO> mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -934,6 +980,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
 
 
             case 11:
@@ -947,6 +994,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -976,6 +1024,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1005,6 +1054,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1027,6 +1077,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 12:
                 //**kV变电站**指标合格率（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1038,6 +1089,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1067,6 +1119,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1096,6 +1149,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1118,6 +1172,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 13:
                 //**kV变电站**指标平均超标占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1129,6 +1184,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1158,6 +1214,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1187,6 +1244,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1209,6 +1267,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 14:
                 //**kV变电站**指标平均合格率（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1220,6 +1279,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1249,6 +1309,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1278,6 +1339,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1300,7 +1362,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
-
+                break;
 
             case 15:
                 //监测到暂态指标的变电站占比（%）
@@ -1311,6 +1373,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusStationEventY::getOrgId, deptCodeIds);
                         Page<RDimBusStationEventY> yPage = rDimBusStationEventYMapper.selectPage(new <RDimBusStationEventY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimBusStationEventY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimBusStationEventY> mapY = yList.stream().collect(Collectors.toMap(RDimBusStationEventY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1338,6 +1401,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusStationEventM::getOrgId, deptCodeIds);
                         Page<RDimBusStationEventM> mPage = rDimBusStationEventMMapper.selectPage(new <RDimBusStationEventM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimBusStationEventM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimBusStationEventM> mapM = mList.stream().collect(Collectors.toMap(RDimBusStationEventM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1365,6 +1429,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimBusStationEventD::getOrgId, deptCodeIds);
                         Page<RDimBusStationEventD> dPage = rDimBusStationEventDMapper.selectPage(new <RDimBusStationEventD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimBusStationEventD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimBusStationEventD> mapD = dList.stream().collect(Collectors.toMap(RDimBusStationEventD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1387,6 +1452,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 16:
                 //变电站暂态指标发生频次（次/站）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1396,6 +1462,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetY::getOrgId, deptCodeIds).eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1423,6 +1490,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetM::getOrgId, deptCodeIds).eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1450,6 +1518,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetD::getOrgId, deptCodeIds).eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1472,6 +1541,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 17:
                 //监测到暂态指标的变电站母线占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1481,6 +1551,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetY::getOrgId, deptCodeIds).eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1508,6 +1579,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetM::getOrgId, deptCodeIds).eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1535,6 +1607,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetD::getOrgId, deptCodeIds).eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1557,6 +1630,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 18:
                 //变电站母线暂态指标发生频次（次/线）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1566,6 +1640,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetY::getOrgId, deptCodeIds).eq(RDimStationTargetY::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetY> yPage = rDimStationTargetYMapper.selectPage(new <RDimStationTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimStationTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimStationTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1593,6 +1668,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetM::getOrgId, deptCodeIds).eq(RDimStationTargetM::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetM> mPage = rDimStationTargetMMapper.selectPage(new <RDimStationTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimStationTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimStationTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1620,6 +1696,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .in(RDimStationTargetD::getOrgId, deptCodeIds).eq(RDimStationTargetD::getTargetType, dimGlobalDataParam.getTargetType());
                         Page<RDimStationTargetD> dPage = rDimStationTargetDMapper.selectPage(new <RDimStationTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimStationTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimStationTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1642,7 +1719,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
-
+                break;
 
             case 19:
                 //**源荷对象监测率（%）
@@ -1655,6 +1732,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         ;
                         Page<RDimObjRateY> yPage = rDimObjRateYMapper.selectPage(new <RDimObjRateY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimObjRateY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimObjRateY> mapY = yList.stream().collect(Collectors.toMap(RDimObjRateY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1683,6 +1761,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjRateM::getObjType, dimGlobalDataParam.getMainType());
                         Page<RDimObjRateM> mPage = rDimObjRateMMapper.selectPage(new <RDimObjRateM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimObjRateM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimObjRateM> mapM = mList.stream().collect(Collectors.toMap(RDimObjRateM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1711,6 +1790,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjRateD::getObjType, dimGlobalDataParam.getMainType());
                         Page<RDimObjRateD> dPage = rDimObjRateDMapper.selectPage(new <RDimObjRateD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimObjRateD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimObjRateD> mapD = dList.stream().collect(Collectors.toMap(RDimObjRateD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1733,6 +1813,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 20:
                 //**源荷对象超标占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1744,6 +1825,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         ;
                         Page<RDimObjGlobalY> yPage = rDimObjGlobalYMapper.selectPage(new <RDimObjGlobalY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimObjGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimObjGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimObjGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1772,6 +1854,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjGlobalM::getObjectType, dimGlobalDataParam.getMainType());
                         Page<RDimObjGlobalM> mPage = rDimObjGlobalMMapper.selectPage(new <RDimObjGlobalM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimObjGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimObjGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimObjGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1800,6 +1883,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjGlobalD::getObjectType, dimGlobalDataParam.getMainType());
                         Page<RDimObjGlobalD> dPage = rDimObjGlobalDMapper.selectPage(new <RDimObjGlobalD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimObjGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimObjGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimObjGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1822,6 +1906,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
+                break;
             case 21:
                 //**源荷对象平均超标占比（%）
                 switch (dimGlobalDataParam.getDateType()) {
@@ -1833,6 +1918,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         ;
                         Page<RDimObjGlobalY> yPage = rDimObjGlobalYMapper.selectPage(new <RDimObjGlobalY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimObjGlobalY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimObjGlobalY> mapY = yList.stream().collect(Collectors.toMap(RDimObjGlobalY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1861,6 +1947,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjGlobalM::getObjectType, dimGlobalDataParam.getMainType());
                         Page<RDimObjGlobalM> mPage = rDimObjGlobalMMapper.selectPage(new <RDimObjGlobalM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimObjGlobalM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimObjGlobalM> mapM = mList.stream().collect(Collectors.toMap(RDimObjGlobalM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1889,6 +1976,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjGlobalD::getObjectType, dimGlobalDataParam.getMainType());
                         Page<RDimObjGlobalD> dPage = rDimObjGlobalDMapper.selectPage(new <RDimObjGlobalD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimObjGlobalD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimObjGlobalD> mapD = dList.stream().collect(Collectors.toMap(RDimObjGlobalD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1911,7 +1999,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         }
                         break;
                 }
-
+                break;
 
             case 22:
                 //**源荷对象**指标超标占比（%）
@@ -1925,6 +2013,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         ;
                         Page<RDimObjTargetY> yPage = rDimObjTargetYMapper.selectPage(new <RDimObjTargetY>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperY);
                         List<RDimObjTargetY> yList = yPage.getRecords();
+                        resultPage.setTotal(yPage.getTotal());
                         if (CollectionUtil.isNotEmpty(yList)) {
                             Map<String, RDimObjTargetY> mapY = yList.stream().collect(Collectors.toMap(RDimObjTargetY::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1955,6 +2044,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
 
                         Page<RDimObjTargetM> mPage = rDimObjTargetMMapper.selectPage(new <RDimObjTargetM>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperM);
                         List<RDimObjTargetM> mList = mPage.getRecords();
+                        resultPage.setTotal(mPage.getTotal());
                         if (CollectionUtil.isNotEmpty(mList)) {
                             Map<String, RDimObjTargetM> mapM = mList.stream().collect(Collectors.toMap(RDimObjTargetM::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -1983,6 +2073,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                                 .eq(StrUtil.isNotEmpty(dimGlobalDataParam.getMainType()), RDimObjTargetD::getObjectType, dimGlobalDataParam.getMainType());
                         Page<RDimObjTargetD> dPage = rDimObjTargetDMapper.selectPage(new <RDimObjTargetD>Page(PageFactory.getPageNum(dimGlobalDataParam), PageFactory.getPageSize(dimGlobalDataParam)), lambdaQueryWrapperD);
                         List<RDimObjTargetD> dList = dPage.getRecords();
+                        resultPage.setTotal(dPage.getTotal());
                         if (CollectionUtil.isNotEmpty(dList)) {
                             Map<String, RDimObjTargetD> mapD = dList.stream().collect(Collectors.toMap(RDimObjTargetD::getOrgId, Function.identity()));
                             for (Dept d : deptList) {
@@ -2006,7 +2097,7 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService {
                         break;
                 }
 
-
+                break;
         }