wxz
							
						 | 
						
							
							
							
								
							
								7dc7613e61
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								90041578e5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								dc26486624
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5b5033f6d5
								
							
								
							
						 | 
						
							
							
								
								job服务增加大屏的agency,grid,dept维度初始化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								025ef42093
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9980ea0a91
								
							
								
							
						 | 
						
							
							
								
								修改controller方法的名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								89e72d6fde
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								84b06adb5e
								
							
								
							
						 | 
						
							
							
								
								指标添加 所有指标路径
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fece3d5ba7
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0df3674fc2
								
							
								
							
						 | 
						
							
							
								
								修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								31a348737c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data_2.0' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								282acc9b13
								
							
								
							
						 | 
						
							
							
								
								增加index维度初始化的feignclient调用接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9eed0be534
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								56e386fe3f
								
							
								
							
						 | 
						
							
							
								
								新增:index库的screen_customer_agency,screen_customer_dept,screen_customer_grid的初始化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								158bc192d1
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								78f00d6728
								
							
								
							
						 | 
						
							
							
								
								内测 获取所有下级AgencyId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4f8b998771
								
							
								
							
						 | 
						
							
							
								
								内测 获取所有下级AgencyId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ba29923de8
								
							
								
							
						 | 
						
							
							
								
								恢复日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bf010cdbb6
								
							
								
							
						 | 
						
							
							
								
								暂时屏蔽extjson中添加customerName  130
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7431361c84
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a9b6110f32
								
							
								
							
						 | 
						
							
							
								
								暂时屏蔽extjson中添加customerName
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6ab7c5240e
								
							
								
							
						 | 
						
							
							
								
								部署statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9d7ff868b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2f812f08bf
								
							
								
							
						 | 
						
							
							
								
								FEIGN日志测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								507552f183
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8b657daf29
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c496230cfa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5b56ae2d3c
								
							
								
							
						 | 
						
							
							
								
								FEIGN日志测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								770b1eeb05
								
							
								
							
						 | 
						
							
							
								
								部署statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f5a41dbc1d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b304b93cea
								
							
								
							
						 | 
						
							
							
								
								screen_相关表service
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3405d81864
								
							
								
							
						 | 
						
							
							
								
								部署statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e7db73a2b5
								
							
								
							
						 | 
						
							
							
								
								线程数量控制
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								26d8a34373
								
							
								
							
						 | 
						
							
							
								
								业务库到origin表 相关service挪到todata包下
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b0dd2dfea3
								
							
								
							
						 | 
						
							
							
								
								修改网格相关指标采集  ,调用FactIndexServiceAblityGridMonthlyService
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								33218300c8
								
							
								
							
						 | 
						
							
							
								
								统计库到指标值表,代码迁移到dataToIndex包下
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0ffcb7d84d
								
							
								
							
						 | 
						
							
							
								
								修改查不到客户网格信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								69cc574f68
								
							
								
							
						 | 
						
							
							
								
								修改查不到客户网格信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3716b28c0a
								
							
								
							
						 | 
						
							
							
								
								公共方法添加【根据monthId获取上月monthId】
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c5a2122ef
								
							
								
							
						 | 
						
							
							
								
								测试feign日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ffcada4f2e
								
							
								
							
						 | 
						
							
							
								
								部署job statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								31702ea694
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9012959144
								
							
								
							
						 | 
						
							
							
								
								删除无用fallBack
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7308e5ae8f
								
							
								
							
						 | 
						
							
							
								
								Revert "加log"
							
							
							
							
							
							
								
							
							
							This reverts commit 9e82a8ba 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								95f6baae92
								
							
								
							
						 | 
						
							
							
								
								部署job
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7cd451a248
								
							
								
							
						 | 
						
							
							
								
								stats服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ae4223b460
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9e82a8bae5
								
							
								
							
						 | 
						
							
							
								
								加log
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2139b4f999
								
							
								
							
						 | 
						
							
							
								
								部署statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								88115623d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |