wangchao
							
						 | 
						
							
							
							
								
							
								95f1a75916
								
							
								
							
						 | 
						
							
							
								
								data-stats服务添加积分数据源
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								121c2a2122
								
							
								
							
						 | 
						
							
							
								
								孔村大屏、数据改版接口去掉多余注解;数据改版部分接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a288e76b85
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9fe924b210
								
							
								
							
						 | 
						
							
							
								
								toScreen  中央区数据
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7144c93e87
								
							
								
							
						 | 
						
							
							
								
								自身和下级分数需要权重 没有原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								95358d3653
								
							
								
							
						 | 
						
							
							
								
								治理能力统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be5720bfc9
								
							
								
							
						 | 
						
							
							
								
								Ext_Json修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6811d21a17
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9f967e449f
								
							
								
							
						 | 
						
							
							
								
								先进模范-组织
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e243877112
								
							
								
							
						 | 
						
							
							
								
								去掉了白名单的概念
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c37a6e44d7
								
							
								
							
						 | 
						
							
							
								
								完成"内部鉴权+外部应用鉴权"的整合
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9df5611c7c
								
							
								
							
						 | 
						
							
							
								
								除同级对比其他各项数据不乘权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								84648de7be
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c275029847
								
							
								
							
						 | 
						
							
							
								
								添加应用校验注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1c29fad1a3
								
							
								
							
						 | 
						
							
							
								
								议题主表添加字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								911fc32393
								
							
								
							
						 | 
						
							
							
								
								党建引领
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								da15e9662a
								
							
								
							
						 | 
						
							
							
								
								数据改版部分接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3bb87f91ce
								
							
								
							
						 | 
						
							
							
								
								议题主表pids修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3b851866ba
								
							
								
							
						 | 
						
							
							
								
								网格治理能力查询数据库修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								38176bc886
								
							
								
							
						 | 
						
							
							
								
								网格党建能力查询数据库修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e7258961d6
								
							
								
							
						 | 
						
							
							
								
								党员基本情况抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7a393c3cb8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								97de867306
								
							
								
							
						 | 
						
							
							
								
								话题原始数据抽取添加pids:改为网格的pids
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7d5ba71c28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e093081291
								
							
								
							
						 | 
						
							
							
								
								自身和下级抽取常量
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								909df3305a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d6831e5815
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.5 louti
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c721341e0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2a73d876b0
								
							
								
							
						 | 
						
							
							
								
								自身和下级分数计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6ec26edad9
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.5
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d86c822278
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								044799cf0e
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.4社区
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								463a9bbbd2
								
							
								
							
						 | 
						
							
							
								
								放开机器人
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								99e6d6b665
								
							
								
							
						 | 
						
							
							
								
								党员基本情况抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								51c6fe5afc
								
							
								
							
						 | 
						
							
							
								
								党员基本情况抽取定时任务添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								42c7b6fd07
								
							
								
							
						 | 
						
							
							
								
								党员基本情况抽取定时任务添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								638481baf1
								
							
								
							
						 | 
						
							
							
								
								党员基本情况抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								53a3c14e4a
								
							
								
							
						 | 
						
							
							
								
								引入redisson分布式锁
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b70ef58633
								
							
								
							
						 | 
						
							
							
								
								添加下级及自身分数 数据
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0ed9c2921f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b1de6d36b4
								
							
								
							
						 | 
						
							
							
								
								先进模范数据抽取到大屏表screen_pioneer_dataV0.3
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dd90609bec
								
							
								
							
						 | 
						
							
							
								
								project_main添加isResolved状态
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c8fffee6c3
								
							
								
							
						 | 
						
							
							
								
								重构认证-初步完成重构内部应用认证,待验证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								e3898bc5a6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								46de4fa739
								
							
								
							
						 | 
						
							
							
								
								projetc_log、group_member添加pids,分别表示不同的涵义
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								eeb2791675
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7dde2c65c9
								
							
								
							
						 | 
						
							
							
								
								获取下级部门的数据 添加月份条件,并返回组织类型
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4f278d6bb0
								
							
								
							
						 | 
						
							
							
								
								能力指标数据接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								243f9e8ef5
								
							
								
							
						 | 
						
							
							
								
								议题抽取状态更新添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5857c6cb58
								
							
								
							
						 | 
						
							
							
								
								组织自身和下级分数
							
							
							
							
								
							
							
						 | 
						5 years ago |