diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 224f55f61c..5055a01925 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2158,18 +2158,20 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve String endDateID, Boolean needCount) { - boolean isStartDateIdBlank = StringUtils.isBlank(startDateID); - boolean isEndDateIdBlank = StringUtils.isBlank(endDateID); - - if (isStartDateIdBlank && !isEndDateIdBlank) { - // 查询截止时间的累计值,直接查询表里的total即可 - PageHelper.startPage(pageNo, pageSize, needCount); - return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID); - } else if (!isStartDateIdBlank && !isEndDateIdBlank) { - // 查询时间段内的增量,需要使用表中的增量列计算 - return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID, endDateID); - } else { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误"); - } + //boolean isStartDateIdBlank = StringUtils.isBlank(startDateID); + //boolean isEndDateIdBlank = StringUtils.isBlank(endDateID); + // + //if (isStartDateIdBlank && !isEndDateIdBlank) { + // // 查询截止时间的累计值,直接查询表里的total即可 + // PageHelper.startPage(pageNo, pageSize, needCount); + // return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID); + //} else if (!isStartDateIdBlank && !isEndDateIdBlank) { + // // 查询时间段内的增量,需要使用表中的增量列计算 + // return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID, endDateID); + //} else { + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误"); + //} + + return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID, endDateID); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml index 4a5c0e7578..4d3426a048 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml @@ -185,9 +185,12 @@ AND member.GRID_ID = #{gridId} - - and member.DATE_ID >= #{startDateID} - and member.DATE_ID #{endDateID} + + and member.DATE_ID >= #{startDateID} + + + and member.DATE_ID #{endDateID} + group by member.grid_id, member.staff_id, member.STAFF_NAME diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml index d95a39d0a4..2d0845dbf0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -80,7 +80,7 @@ and sprd.DATE_ID >= #{startDateId} - and sprd.DATE_ID #{endDateID} + and sprd.DATE_ID #{endDateID} group by sprd.STAFF_ID, sprd.GRID_ID