jianjun
							
						 | 
						
							
							
							
								
							
								0243c686cb
								
							
								
							
						 | 
						
							
							
								
								部署消息通知排除本地的
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								174358f68f
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8f507bbd35
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								634d8976b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								fd0ffe0a4c
								
							
								
							
						 | 
						
							
							
								
								指数 - 年表,计算,乘以权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b4254b09f9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2595269922
								
							
								
							
						 | 
						
							
							
								
								新增:数据统计-重新执行所有pendding中的计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d5b1c5a225
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2c4b5c7dd1
								
							
								
							
						 | 
						
							
							
								
								指标优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								caee1c7eb3
								
							
								
							
						 | 
						
							
							
								
								党员年龄分布,修改返回为NaN的情况
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								51f7ebeb6a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0bcdd40b77
								
							
								
							
						 | 
						
							
							
								
								sql优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6d140ff115
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d82f6bfb57
								
							
								
							
						 | 
						
							
							
								
								部门权重值 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								7b95a70e46
								
							
								
							
						 | 
						
							
							
								
								赋默认值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								fac7c50e55
								
							
								
							
						 | 
						
							
							
								
								部门 权重值特殊处理
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5824179dd1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c5e2a42abd
								
							
								
							
						 | 
						
							
							
								
								添加权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								b815c55569
								
							
								
							
						 | 
						
							
							
								
								撤销
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								252bb39088
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b0d8c36023
								
							
								
							
						 | 
						
							
							
								
								添加权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								3d1e651805
								
							
								
							
						 | 
						
							
							
								
								处理权重 值为null
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								505aa8be14
								
							
								
							
						 | 
						
							
							
								
								添加权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09e0f8fbee
								
							
								
							
						 | 
						
							
							
								
								孔村大屏数据采集/data/stats/kcscreencoll/project/categorysummary,入参注释修改为一级类别id一级类别名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								7f8b7054cb
								
							
								
							
						 | 
						
							
							
								
								增加权重值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								abd20e3967
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7352f239c1
								
							
								
							
						 | 
						
							
							
								
								添加权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6d9dd4b262
								
							
								
							
						 | 
						
							
							
								
								screen_index_data_monthly 表新增三大能力指标权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								572538c381
								
							
								
							
						 | 
						
							
							
								
								fact_index_XXX_score相关表增加权重weight  louti
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8a412c0d1f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								49bcf5d787
								
							
								
							
						 | 
						
							
							
								
								fact_index_XXX_score相关表增加权重weight
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6421327229
								
							
								
							
						 | 
						
							
							
								
								计算器返回权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b53fd85ae9
								
							
								
							
						 | 
						
							
							
								
								添加指标权重 缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6a0b538584
								
							
								
							
						 | 
						
							
							
								
								注释indexCode输出,之前community拼错了。测试数据screen_customer_agency已经改了。
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								27b280a6e1
								
							
								
							
						 | 
						
							
							
								
								日志调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								417a96901e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								300c001ef9
								
							
								
							
						 | 
						
							
							
								
								指数年表、月表逻辑修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4c7fc33f49
								
							
								
							
						 | 
						
							
							
								
								修改逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6f07042657
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jar_name' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f816e0c3ca
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jar_name' into dev_screen_data
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								117c54a512
								
							
								
							
						 | 
						
							
							
								
								修改docker配置文件,将app.jar->xxx.jar
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0b4a7ae413
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a3657d869a
								
							
								
							
						 | 
						
							
							
								
								修改环境变量
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								62d097893f
								
							
								
							
						 | 
						
							
							
								
								修改epmet-admin服务的jar名称,由app.jar->epmet-admin.jar
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b7d937f966
								
							
								
							
						 | 
						
							
							
								
								添加指标计算脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								eaa4ec544c
								
							
								
							
						 | 
						
							
							
								
								年表平均值计算逻辑修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6e1fa0f0a6
								
							
								
							
						 | 
						
							
							
								
								小数点位数修改 大屏指数查询公用API
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								fb52eb0ec5
								
							
								
							
						 | 
						
							
							
								
								安宁指数 返回1位小数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								5813c25ea4
								
							
								
							
						 | 
						
							
							
								
								安宁指数排行,返回2位小数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d8be8c10a4
								
							
								
							
						 | 
						
							
							
								
								screen_kc_volunteer_heat_rank_grid_daily 表增加字段【积分、志愿者id】
							
							
							
							
								
							
							
						 | 
						5 years ago |