Merge branch 'dev_grid_platform' into develop

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java

@@ -24,7 +24,7 @@ public class EventInfoResultDTO implements Serializable {
      */
     private String customerId;
 
-    private Integer detpId;
+    private String orgId;
 
     private String reporterId;
 

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

@@ -169,10 +169,12 @@ public class DataReportingServiceImpl implements DataReportingService {
 				EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId());
+					dto.setOrgId(project.getOrgId());
 					dto.setOrgCode(agency.getCode());
 					dto.setOrgName(agency.getAgencyName());
 				} else {
 					ScreenCustomerGridDTO grid = screenCustomerGridService.getGridById(project.getOrgId());
+					dto.setOrgId(project.getOrgId());
 					dto.setOrgCode(grid.getCode());
 					dto.setOrgName(grid.getGridName());
 				}

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

@@ -94,19 +94,20 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             List<BaseConflictsResolveEntity> resolveList = list.stream().map(item -> {
                 BaseConflictsResolveEntity entity = new BaseConflictsResolveEntity();
                 entity.setId(item.getId());
-                entity.setGridId(deptMap.get(item.getOrgCode()));
+                entity.setGridId(deptMap.get(item.getOrgId()));
                 entity.setGridName(item.getOrgName());
                 entity.setEventName(item.getEventName());
                 entity.setHappenDate(item.getHappenDate());
                 entity.setHappenPlace(item.getHappenPlace());
                 entity.setEventDescription(item.getEventDescription());
-                entity.setLng(item.getLng().toString());
+                entity.setLng(item.getLng().toPlainString());
-                entity.setLat(item.getLat().toString());
+                entity.setLat(item.getLat().toPlainString());
-                entity.setCreateBy(String.valueOf(userMap.get(item.getReporterId())));
+                entity.setCreateBy(null == userMap.get(item.getReporterId())?null:String.valueOf(userMap.get(item.getReporterId())));
                 entity.setCreateDate(item.getReportTime());
                 entity.setUpdateDate(new Date());
                 entity.setStatus(item.getStatus());
                 entity.setFirstEventCategory(item.getParentEventCategory());
+                entity.setSource("01");
                 entity.setSecondEventCategory(item.getEventCategory());
                 entity.setResolveWay(item.getWaysOfResolving());
                 entity.setResolveGridLevel(item.getCompleteLevel());
@@ -124,5 +125,4 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             }
         }
     }
-
 }

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

@@ -109,7 +109,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
         if (CollectionUtils.isEmpty(entityList)) {
             return Collections.emptyMap();
         }
-        return entityList.stream().collect(Collectors.toMap(ExDeptEntity::getGridCode, ExDeptEntity::getDeptId, (key1, key2) -> key2));
+        return entityList.stream().collect(Collectors.toMap(ExDeptEntity::getQxDeptId, ExDeptEntity::getDeptId, (key1, key2) -> key2));
     }
 
 }