|  |  | @ -1,5 +1,6 @@ | 
			
		
	
		
			
				
					|  |  |  | package com.epmet.service.evaluationindex.extract.dataToIndex.impl; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | import com.alibaba.fastjson.JSON; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.constant.NumConstant; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.utils.ConvertUtils; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.utils.DateUtils; | 
			
		
	
	
		
			
				
					|  |  | @ -310,9 +311,12 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { | 
			
		
	
		
			
				
					|  |  |  |         List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotal(customerId, monthId); | 
			
		
	
		
			
				
					|  |  |  |         //网格总项目数 从议题根据状态获取
 | 
			
		
	
		
			
				
					|  |  |  |         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT); | 
			
		
	
		
			
				
					|  |  |  |         log.info("网格总项目数{}", JSON.toJSONString(gridProjectTotalList)); | 
			
		
	
		
			
				
					|  |  |  |         //网格议题转项目率
 | 
			
		
	
		
			
				
					|  |  |  |         List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId)); | 
			
		
	
		
			
				
					|  |  |  |         log.info("网格近两个月的议题{}", JSON.toJSONString(gridIssueCountList)); | 
			
		
	
		
			
				
					|  |  |  |         List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueCountList, gridProjectTotalList); | 
			
		
	
		
			
				
					|  |  |  |         log.info("网格议题转项目率{}", JSON.toJSONString(gridIssueShiftProjectRatio)); | 
			
		
	
		
			
				
					|  |  |  |         //网格自治项目数 从议题创建到项目关闭,包括处理人,自始至终没有出过议题所属网格
 | 
			
		
	
		
			
				
					|  |  |  |         List<AutoNoMyResultDTO> projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId); | 
			
		
	
		
			
				
					|  |  |  |         Map<String,Integer> autoMap = new HashMap<>(16); | 
			
		
	
	
		
			
				
					|  |  | @ -398,7 +402,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { | 
			
		
	
		
			
				
					|  |  |  |                 }); | 
			
		
	
		
			
				
					|  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |             // 2. 网格总项目数,网格议题转项目率
 | 
			
		
	
		
			
				
					|  |  |  |             if (!CollectionUtils.isEmpty(gridIssueTotalList)){ | 
			
		
	
		
			
				
					|  |  |  |             if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio)){ | 
			
		
	
		
			
				
					|  |  |  |                 gridIssueShiftProjectRatio.forEach(projectTotal -> { | 
			
		
	
		
			
				
					|  |  |  |                     if (r.getGridId().equals(projectTotal.getGridId())){ | 
			
		
	
		
			
				
					|  |  |  |                         r.setProjectTotal(projectTotal.getProjectTotal()); | 
			
		
	
	
		
			
				
					|  |  | 
 |