Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java

@@ -143,7 +143,8 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             yesterdayPatrolList.forEach(patrol -> {
                 //项目立项时间 在巡查期间时 总数加1
                 long projectCreateTime = projectDTO.getCreatedTime().getTime();
-                if (projectCreateTime>= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) {
+                //创建人为网格员 且时间在巡查期间的 则上报的项目数加1
+                if (projectDTO.getCreatedBy().equals(patrol.getStaffId()) && projectCreateTime>= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) {
                     String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId());
                     StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey);
                     if (recordDailyDTO == null) {