|
|
@ -108,8 +108,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove |
|
|
|
Map<String,Integer> issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED); |
|
|
|
Map<String,Integer> approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED); |
|
|
|
Map<String,Integer> approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED); |
|
|
|
Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR); |
|
|
|
Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR); |
|
|
|
Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR); |
|
|
|
Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR); |
|
|
|
Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds); |
|
|
|
|
|
|
|
for(FactGridGovernDailyEntity insertEntity:insertEntityList){ |
|
|
@ -278,6 +278,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove |
|
|
|
boolean inGridClosed = checkIsInGridClosed(governProjectInfoDTO.getGridId(), |
|
|
|
governProjectInfoDTO.getProjectLogDTOList()); |
|
|
|
if (inGridClosed) { |
|
|
|
log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于网格自治"); |
|
|
|
// 2、在网格内流转结案的,计算以下下值
|
|
|
|
if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(governProjectInfoDTO.getOrigin())) { |
|
|
|
if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) { |
|
|
@ -301,12 +302,15 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove |
|
|
|
String resolveOrgType=getProjectResolveOrgType(governProjectInfoDTO.getProjectLogDTOList()); |
|
|
|
if("community".equals(resolveOrgType)){ |
|
|
|
// 当前网格内出来的项目:由社区结案(已解决+未解决)的项目总数
|
|
|
|
log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于社区解决"); |
|
|
|
communityClosedCount+=1; |
|
|
|
}else if("street".equals(resolveOrgType)){ |
|
|
|
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
|
|
|
|
log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于街道解决"); |
|
|
|
streetClosedCount+=1; |
|
|
|
}else if("districtdept".equals(resolveOrgType)){ |
|
|
|
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
|
|
|
|
log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于区直部门解决"); |
|
|
|
districtDeptClosedCount+=1; |
|
|
|
} |
|
|
|
// todo 可能是 市级解决、省级解决呢???
|
|
|
@ -334,7 +338,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove |
|
|
|
private String getProjectResolveOrgType(List<FactOriginProjectLogDailyDTO> projectLogDTOList) { |
|
|
|
List<Integer> handleLevelList=new ArrayList<>(); |
|
|
|
for (FactOriginProjectLogDailyDTO logDailyDTO : projectLogDTOList) { |
|
|
|
if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){ |
|
|
|
if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)||NumConstant.ZERO==logDailyDTO.getIsActive()){ |
|
|
|
//当前操作如果是退回,不参与比较
|
|
|
|
continue; |
|
|
|
} |
|
|
@ -422,7 +426,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove |
|
|
|
private boolean checkIsInGridClosed(String gridId, List<FactOriginProjectLogDailyDTO> projectLogDTOList) { |
|
|
|
boolean flag = true; |
|
|
|
for (FactOriginProjectLogDailyDTO detail : projectLogDTOList) { |
|
|
|
if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){ |
|
|
|
if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN) |
|
|
|
|| NumConstant.ZERO==detail.getIsActive()){ |
|
|
|
//当前操作如果是退回,不参与比较
|
|
|
|
continue; |
|
|
|
} |
|
|
|