sunyuchao
							
						 | 
						
							
							
							
								
							
								bfe24cc228
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4a6f8bbfd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								87f7b11197
								
							
								
							
						 | 
						
							
							
								
								添加flyway文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c9dabcadaf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d31e78978c
								
							
								
							
						 | 
						
							
							
								
								sql文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b62b1aefb3
								
							
								
							
						 | 
						
							
							
								
								大屏数据接口分页修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7456f6a223
								
							
								
							
						 | 
						
							
							
								
								添加测试及生产数据库配置文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d500323d83
								
							
								
							
						 | 
						
							
							
								
								修改:flyway脚本版本号修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d65cc6cea2
								
							
								
							
						 | 
						
							
							
								
								新增:外部应用秘钥重置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5159201f09
								
							
								
							
						 | 
						
							
							
								
								添加大屏数据库脚本文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ec29fcc834
								
							
								
							
						 | 
						
							
							
								
								添加数据库,包移动
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								abc777a489
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f5ffb40bbf
								
							
								
							
						 | 
						
							
							
								
								错误修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								cbf4295b35
								
							
								
							
						 | 
						
							
							
								
								mapper修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								87b63b5db8
								
							
								
							
						 | 
						
							
							
								
								大屏数据接口修改,在没有当月数据时默认查询之前的月份,数据范围:最多向前跨越一年
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e29b1d1546
								
							
								
							
						 | 
						
							
							
								
								删除默认footbar,连带删除所有客户的footbar(生产上不用,测试用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								425f9114e9
								
							
								
							
						 | 
						
							
							
								
								去掉注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2a0330c055
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3dff6f26e7
								
							
								
							
						 | 
						
							
							
								
								去掉注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6f1c491aae
								
							
								
							
						 | 
						
							
							
								
								添加数据源待测,移动包
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e70bdf3680
								
							
								
							
						 | 
						
							
							
								
								添加数据源待测,移动包
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6ef78976f1
								
							
								
							
						 | 
						
							
							
								
								footbar详情增加"defaultPageTilte"的返回
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8d228f870b
								
							
								
							
						 | 
						
							
							
								
								修复barname判断错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d18b4b7d68
								
							
								
							
						 | 
						
							
							
								
								街道相关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								77683557fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								17378a8c59
								
							
								
							
						 | 
						
							
							
								
								indexcal 指标计算,结果; indexcoll指标采集
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								af9298e087
								
							
								
							
						 | 
						
							
							
								
								阈值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								595aca1e57
								
							
								
							
						 | 
						
							
							
								
								修改:footbar物理删除
							
							
							
							
							
							
								
							
							
							修改:更新footbar信息的时候,name唯一性判断逻辑修改 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f9b1f60b9b
								
							
								
							
						 | 
						
							
							
								
								街道相关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d2d099c74c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09d0e5d94c
								
							
								
							
						 | 
						
							
							
								
								有阈值,且最大值>阈值,则最大值赋值为阈值;allRegion=》district
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								14142d608d
								
							
								
							
						 | 
						
							
							
								
								区/街道相关分数表,区直部门分值表相关文件添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0b6ee2a2ee
								
							
								
							
						 | 
						
							
							
								
								新增:md5摘要验签方式的外部应用认证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2b907596aa
								
							
								
							
						 | 
						
							
							
								
								社区相关优化 7
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								94c928452f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								667dd0ef25
								
							
								
							
						 | 
						
							
							
								
								网格相关-只上传一条事实记录,分值默认50
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								16097c9899
								
							
								
							
						 | 
						
							
							
								
								增加:footbar删除功能
							
							
							
							
							
							
								
							
							
							增加:oper运营端查询footbar列表功能
修复:footbar列表增加display新列的返回 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e456e1d8bf
								
							
								
							
						 | 
						
							
							
								
								社区相关优化 6
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								543dbeee5f
								
							
								
							
						 | 
						
							
							
								
								社区相关优化 4
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								be586db3bf
								
							
								
							
						 | 
						
							
							
								
								归一区间改为0-100
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								53caf7dc2d
								
							
								
							
						 | 
						
							
							
								
								社区相关优化 3
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7e53f5e9d0
								
							
								
							
						 | 
						
							
							
								
								修改IndexCalculateService包路径
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								94b81f624f
								
							
								
							
						 | 
						
							
							
								
								修改:同步客户的footbar的时候,修改bar存在性验证逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								22631d5f00
								
							
								
							
						 | 
						
							
							
								
								修改:添加footbar,同步到已经有自定义footbar的客户下
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ecc1ee9738
								
							
								
							
						 | 
						
							
							
								
								总分计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b21973d9e8
								
							
								
							
						 | 
						
							
							
								
								导入指标调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c64fc58d60
								
							
								
							
						 | 
						
							
							
								
								去除测试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								352c936f4f
								
							
								
							
						 | 
						
							
							
								
								1、定制功能修改-支持修改功能说明。2.列表查询sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								16b00514cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								10c0794eec
								
							
								
							
						 | 
						
							
							
								
								avgShiftProjectRatio=>issueToProjectRatio
							
							
							
							
								
							
							
						 | 
						5 years ago |