sunyuchao
							
						 | 
						
							
							
							
								
							
								8664d1cd65
								
							
								
							
						 | 
						
							
							
								
								数据接口 保留一位小数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								105669cf8d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0d739010ac
								
							
								
							
						 | 
						
							
							
								
								自己系统缺少的部分数据查询接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9ced7bf3fd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f63d437461
								
							
								
							
						 | 
						
							
							
								
								内部应用注解认证修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5c6929a51c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev_externalappauth
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2b988de560
								
							
								
							
						 | 
						
							
							
								
								增加内部应用认证注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2e6b6b0ee1
								
							
								
							
						 | 
						
							
							
								
								党员数据抽取添加pids
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4a6a227393
								
							
								
							
						 | 
						
							
							
								
								党员大屏数据抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								676c76c9ff
								
							
								
							
						 | 
						
							
							
								
								党员大屏数据抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								24536ebcf8
								
							
								
							
						 | 
						
							
							
								
								代码修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3426d3bf6d
								
							
								
							
						 | 
						
							
							
								
								党员大屏数据抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a1c555f5b
								
							
								
							
						 | 
						
							
							
								
								捕获跟组织数据异常
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb65e8c09b
								
							
								
							
						 | 
						
							
							
								
								话题原始数据抽取添加pids
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								19313bb233
								
							
								
							
						 | 
						
							
							
								
								办结效率、办结率做响应调整,调整部分方法名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d0062de91e
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1e69f39dfd
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b6f77f32dd
								
							
								
							
						 | 
						
							
							
								
								准备上线 commonservice report statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d0779e7577
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f780bff48d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								edd0de7fab
								
							
								
							
						 | 
						
							
							
								
								指标自身和下级代码暂存
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								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
							
						 | 
						
							
							
							
								
							
								30fad8d833
								
							
								
							
						 | 
						
							
							
								
								暂时屏蔽extjson中添加customerName  生产
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ad27a56265
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a9b6110f32
								
							
								
							
						 | 
						
							
							
								
								暂时屏蔽extjson中添加customerName
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								5b56ae2d3c
								
							
								
							
						 | 
						
							
							
								
								FEIGN日志测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b304b93cea
								
							
								
							
						 | 
						
							
							
								
								screen_相关表service
							
							
							
							
								
							
							
						 | 
						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 |