新版事件上报第三方

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

@@ -350,6 +350,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setCompleteTime(project.getCloseCaseTime());
 		dto.setLat(project.getLatitude());
 		dto.setLng(project.getLongitude());
+		dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED);
 		return dto;
 	}
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java

@@ -93,6 +93,14 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             if (CollectionUtils.isNotEmpty(staffList)) {
                 entity.setGridUserCardid(staffList.get(NumConstant.ZERO).getCardNum());
                 entity.setGridUserName(staffList.get(NumConstant.ZERO).getNickName());
+            } else {
+                staffWrapper = new LambdaQueryWrapper<>();
+                staffWrapper.eq(GridstaffInfoPingyinEntity::getGridCode, item.getOrgCode());
+                staffList = gridstaffInfoPingyinDao.selectList(staffWrapper);
+                if (CollectionUtils.isNotEmpty(staffList)) {
+                    entity.setGridUserCardid(staffList.get(NumConstant.ZERO).getCardNum());
+                    entity.setGridUserName(staffList.get(NumConstant.ZERO).getNickName());
+                }
             }
 
             entity.setReportTime(item.getReportTime());