zxc
							
						 | 
						
							
							
							
								
							
								d8c32d1824
								
							
								
							
						 | 
						
							
							
								
								全区能力指数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d2ed5b35f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_notic_bug_syc' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a86aaae641
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								431d93a549
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0a2fcd9de2
								
							
								
							
						 | 
						
							
							
								
								成就轮播修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c434ad6a9c
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								33ce7ee4f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6f5c7b5375
								
							
								
							
						 | 
						
							
							
								
								特殊处理下%d
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1045eedced
								
							
								
							
						 | 
						
							
							
								
								street级别 能力指数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ab056ec6c0
								
							
								
							
						 | 
						
							
							
								
								wxcode获取微信信息接口添加日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6f72eb8d9f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								48103d32f8
								
							
								
							
						 | 
						
							
							
								
								平均值数量 不格式化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7fd907f093
								
							
								
							
						 | 
						
							
							
								
								少一个网格
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6dbad74c44
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								83de4c20d8
								
							
								
							
						 | 
						
							
							
								
								得分说明 保留分数保留一位小数,权重保留整数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								776e86aa4a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bdabd15c34
								
							
								
							
						 | 
						
							
							
								
								网格相关、区直部门相关,指标计算,改为以screen_customer_grid、screen_customer_dept为主表。当前部门或网格没有原始指标值时,赋值为0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c14e069f77
								
							
								
							
						 | 
						
							
							
								
								居民端个人中心修改手机号操作必须是居民才可以
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2ff3e1fa6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ea6d23f43d
								
							
								
							
						 | 
						
							
							
								
								结案项目满意度抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								63a5c4d120
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								66ccfbc41f
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6792d0adda
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4fddf998fb
								
							
								
							
						 | 
						
							
							
								
								得分说明 保留分数保留一位小数,权重保留整数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1c8c137bff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								284b6e08f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0521yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								513dd6fdef
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5045c664b2
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d591423871
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_party_group_discuss' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3fa874a0ba
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_party_group_discuss' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_party_group_discuss
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								17eaf21880
								
							
								
							
						 | 
						
							
							
								
								【事件分析】效率分析 排序修改
							
							
							
							
							
							
								
							
							
							公众参与各组织排序修改 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								298c51095d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fix_dim' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9fe9e3f89a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a03da0bc1d
								
							
								
							
						 | 
						
							
							
								
								解决业务库的数据del_flag=1之后,统计库的维度表del_flag无法同步改字段的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4d6cbf0900
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								636fbfd30f
								
							
								
							
						 | 
						
							
							
								
								开发测试机器人地址修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7e6ed026f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2cf9bb2f01
								
							
								
							
						 | 
						
							
							
								
								党员分数计算时 获取党员指标原始值时以用户Id分组
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								819286b1b6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c6ba86de55
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e2898b66cc
								
							
								
							
						 | 
						
							
							
								
								网格层级治理指数增加返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0810594957
								
							
								
							
						 | 
						
							
							
								
								治理指数网格表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d11e04b00
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20cc0ad70a
								
							
								
							
						 | 
						
							
							
								
								五级指标抽取,添加monthId校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bd4de9ed0f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1884559998
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								09700ffc93
								
							
								
							
						 | 
						
							
							
								
								获取组织机构信息接口增加客户跟组织级别返参用于数据统计治理实况模块使用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6c3a29b07a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f78c25f68b
								
							
								
							
						 | 
						
							
							
								
								查询平均值的时候,做平均值为null的判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9a31d5ea62
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |