Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

@@ -227,6 +227,7 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 				FactIssueAgencyMonthlyDTO dto = issueAgencyMonthlyIncList.get(i);
 				if (agency.getId().equals(dto.getAgencyId())) {
 					monthly.setIssueIncr(dto.getIssueIncr());
+					monthly.setVotingIncr(dto.getVotingIncr());
 					monthly.setShiftProjectIncr(dto.getShiftProjectIncr());
 					monthly.setClosedIncr(dto.getClosedIncr());
 					monthly.setClosedResolvedIncr(dto.getClosedResolvedIncr());
@@ -430,6 +431,7 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 				FactIssueGridMonthlyDTO dto = gridMonthlyIncListList.get(i);
 				if (grid.getId().equals(dto.getGridId())) {
 					monthly.setIssueIncr(dto.getIssueIncr());
+					monthly.setVotingIncr(dto.getVotingIncr());
 					monthly.setShiftProjectIncr(dto.getShiftProjectIncr());
 					monthly.setClosedIncr(dto.getClosedIncr());
 					monthly.setClosedResolvedIncr(dto.getClosedResolvedIncr());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml

@@ -51,6 +51,7 @@
         SELECT
             da.ID AS "agencyId",
             SUM(IFNULL(ISSUE_INCR, 0)) AS "issueIncr",
+            SUM(IFNULL(VOTING_INCR, 0)) AS "votingIncr",
             SUM(IFNULL(SHIFT_PROJECT_INCR, 0)) AS "shiftProjectIncr",
             SUM(IFNULL(CLOSED_INCR, 0)) AS "closedIncr",
             SUM(IFNULL(CLOSED_RESOLVED_INCR, 0)) AS "closedResolvedIncr",
@@ -64,6 +65,7 @@
                 AND MONTH_ID = #{monthId}
         WHERE
             da.DEL_FLAG = '0'
+          AND da.AGENCY_DIM_TYPE= 'all'
           AND da.CUSTOMER_ID = #{customerId}
         GROUP BY
             da.ID

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueGridMonthlyDao.xml

@@ -57,6 +57,7 @@
             dg.AGENCY_ID AS "agencyId",
             dg.ID AS "gridId",
             SUM(IFNULL(ISSUE_INCR, 0)) AS "issueIncr",
+            SUM(IFNULL(VOTING_INCR, 0)) AS "votingIncr",
             SUM(IFNULL(SHIFT_PROJECT_INCR, 0)) AS "shiftProjectIncr",
             SUM(IFNULL(CLOSED_INCR, 0)) AS "closedIncr",
             SUM(IFNULL(CLOSED_RESOLVED_INCR, 0)) AS "closedResolvedIncr",