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 | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								300c001ef9
								
							
								
							
						 | 
						
							
							
								
								指数年表、月表逻辑修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4c7fc33f49
								
							
								
							
						 | 
						
							
							
								
								修改逻辑
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								88bc86f5fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d13bf9c484
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8cedf69308
								
							
								
							
						 | 
						
							
							
								
								三大能力分数和修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								dae03d771f
								
							
								
							
						 | 
						
							
							
								
								修改:中止计算,停止计算,示例销毁都会清空redis的计算标记
							
							
							
							
							
							
								
							
							
							停止计算和中止计算还要清空futureMap 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b87b944fc6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7a405702bf
								
							
								
							
						 | 
						
							
							
								
								注释:客户一级指标分值记录不存在
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								62c17e7c7c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6acf962060
								
							
								
							
						 | 
						
							
							
								
								增加终止计算方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9040792b81
								
							
								
							
						 | 
						
							
							
								
								修改rediskey
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b3c67750aa
								
							
								
							
						 | 
						
							
							
								
								党员分批计算总分
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								abdf683674
								
							
								
							
						 | 
						
							
							
								
								5、下级部门指数排行(目前安宁数据端用), 返回值增加 orgId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e92c0fe1f3
								
							
								
							
						 | 
						
							
							
								
								增大堆内存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1508518489
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30f9665afb
								
							
								
							
						 | 
						
							
							
								
								安宁e家客户新增数据采集应用+大屏应用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								453208d87a
								
							
								
							
						 | 
						
							
							
								
								安宁e家客户新增数据采集应用+大屏应用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0d984cbdd4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								02fc5d30bc
								
							
								
							
						 | 
						
							
							
								
								去掉动态数据源的数据源名称打印
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								03581bc245
								
							
								
							
						 | 
						
							
							
								
								subAgencyIndexRank接口添加数据源注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bbbce2d6ce
								
							
								
							
						 | 
						
							
							
								
								联系群众+参与议事  查询平均值,去掉group by
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								37d782aa8d
								
							
								
							
						 | 
						
							
							
								
								添加计算时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f151b5a43c
								
							
								
							
						 | 
						
							
							
								
								添加计算时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d9f4e94281
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ecd133006e
								
							
								
							
						 | 
						
							
							
								
								代码优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9c733775b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago |