Browse Source

修改:

1.网格员工作统计查询,时间范围调整为包含endTime;放弃使用全量方式查询,改用sum(增量)方式统计,以防止漏掉
dev_shibei_match
wangxianzhang 4 years ago
parent
commit
fb8b5af362
  1. 26
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
  2. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
  3. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

26
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, String endDateID,
Boolean needCount) { Boolean needCount) {
boolean isStartDateIdBlank = StringUtils.isBlank(startDateID); //boolean isStartDateIdBlank = StringUtils.isBlank(startDateID);
boolean isEndDateIdBlank = StringUtils.isBlank(endDateID); //boolean isEndDateIdBlank = StringUtils.isBlank(endDateID);
//
if (isStartDateIdBlank && !isEndDateIdBlank) { //if (isStartDateIdBlank && !isEndDateIdBlank) {
// 查询截止时间的累计值,直接查询表里的total即可 // // 查询截止时间的累计值,直接查询表里的total即可
PageHelper.startPage(pageNo, pageSize, needCount); // PageHelper.startPage(pageNo, pageSize, needCount);
return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID); // return factGridMemberStatisticsDailyDao.listGridMemberDataStatsAccumulate(pids, gridId, endDateID);
} else if (!isStartDateIdBlank && !isEndDateIdBlank) { //} 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); return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID, endDateID);
} else {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误");
}
} }
} }

7
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml

@ -185,9 +185,12 @@
<if test="gridId != null and gridId != ''"> <if test="gridId != null and gridId != ''">
AND member.GRID_ID = #{gridId} AND member.GRID_ID = #{gridId}
</if> </if>
<if test="startDateID != null and startDateID!=''">
and member.DATE_ID >= #{startDateID} and member.DATE_ID >= #{startDateID}
and member.DATE_ID <![CDATA[<]]> #{endDateID} </if>
<if test="endDateID != null and endDateID != ''">
and member.DATE_ID <![CDATA[<=]]> #{endDateID}
</if>
group by member.grid_id, group by member.grid_id,
member.staff_id, member.staff_id,
member.STAFF_NAME member.STAFF_NAME

2
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

@ -80,7 +80,7 @@
<if test="startDateId != null and startDateId != ''"> <if test="startDateId != null and startDateId != ''">
and sprd.DATE_ID >= #{startDateId} and sprd.DATE_ID >= #{startDateId}
</if> </if>
and sprd.DATE_ID <![CDATA[<]]> #{endDateID} and sprd.DATE_ID <![CDATA[<=]]> #{endDateID}
group by group by
sprd.STAFF_ID, sprd.STAFF_ID,
sprd.GRID_ID sprd.GRID_ID

Loading…
Cancel
Save