zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1fdc19d62b
								
							
								
							
						 | 
						
							
							
								
								当前组织级下级组织网格部门
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								71956232ca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								382dc4bc5a
								
							
								
							
						 | 
						
							
							
								
								增加人名返参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								83c1b49dc6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1422fcf479
								
							
								
							
						 | 
						
							
							
								
								分析报告差图标
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2e8d2ac5fa
								
							
								
							
						 | 
						
							
							
								
								居民端entergrid、工作端profile接口增加返参供调查问卷提交问卷时使用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								415d1ea323
								
							
								
							
						 | 
						
							
							
								
								ct
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c3e4ab9f25
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0271d4bd48
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2521c22e98
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b19afe5138
								
							
								
							
						 | 
						
							
							
								
								补全
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2d604918a6
								
							
								
							
						 | 
						
							
							
								
								详情
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								44c06c9fd7
								
							
								
							
						 | 
						
							
							
								
								概要
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								93475ad7f7
								
							
								
							
						 | 
						
							
							
								
								概要
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2b04f7d2b2
								
							
								
							
						 | 
						
							
							
								
								userId自动填充
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8ea8ac7bd2
								
							
								
							
						 | 
						
							
							
								
								userId自动填充
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f8d4272389
								
							
								
							
						 | 
						
							
							
								
								生成文件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b5118a47f8
								
							
								
							
						 | 
						
							
							
								
								data-agg添加epmet-tduck数据库
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3485f34881
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							给scan添加平阴私有话服务器的外网ip,并且将所有已有的IP列表放到src/resources/readme下 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d47324bb8a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a5d41c6f62
								
							
								
							
						 | 
						
							
							
								
								替换回来
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0e54ab3da5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fb0bf99901
								
							
								
							
						 | 
						
							
							
								
								第一版用户统计数据代码优化后还原-相成
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ef07c1406
								
							
								
							
						 | 
						
							
							
								
								项目详情,只有工作人员查询缓存接口,需要发布:user、report服务
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4147a7291e
								
							
								
							
						 | 
						
							
							
								
								添加注释:大屏新增普通事件列表:首次查询平阴整个客户下,近30天内的项目,展示分类名称(前端截取第一个-之前的文字)、颜色等级、项目标题。点击8个街道,联动。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2dd9efcb11
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								325a834d2a
								
							
								
							
						 | 
						
							
							
								
								平阴项目分布接口调整 bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f38bb5c719
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ecef89fb0
								
							
								
							
						 | 
						
							
							
								
								平阴项目分布接口调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								94e7f017cb
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								babd4c73c2
								
							
								
							
						 | 
						
							
							
								
								wxController迁移
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c2f45bc4b6
								
							
								
							
						 | 
						
							
							
								
								wxController迁移
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4777b56d32
								
							
								
							
						 | 
						
							
							
								
								wxController
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f5d1c068e0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_statistical_optimize' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1298b0acd7
								
							
								
							
						 | 
						
							
							
								
								去除多余的error信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2ec305e6fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								906dd81205
								
							
								
							
						 | 
						
							
							
								
								添加新字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30c306ba71
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a61fd17deb
								
							
								
							
						 | 
						
							
							
								
								组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f21f8f2a5e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a2c2f99b2a
								
							
								
							
						 | 
						
							
							
								
								评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加,结果值四舍五入保留一位;
							
							
							
							
							
							
								
							
							
							三大能力的分=原始值四舍五入保留一位* 权重,结果值四舍五入保留一位;
               单项原始值:直接四舍五入保留一位小数;】调整
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e7571f0538
								
							
								
							
						 | 
						
							
							
								
								四舍五入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								084be558ed
								
							
								
							
						 | 
						
							
							
								
								month/indexscore接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3dfb39724f
								
							
								
							
						 | 
						
							
							
								
								/report/fact/index/scorelist接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								24c02ab557
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d2ccc1906
								
							
								
							
						 | 
						
							
							
								
								selectMonthPieChart修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8d08abc80c
								
							
								
							
						 | 
						
							
							
								
								screenProjectOrgDaily修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								23936ab743
								
							
								
							
						 | 
						
							
							
								
								组织内有单位领导标签的人排在前面,网格内有网格长标签的人排在前面,部门内有部门领导标签的人排在前面,相同职位及其他职位按创建顺序排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a574ef5683
								
							
								
							
						 | 
						
							
							
								
								差值 差值 代码微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7e1a228191
								
							
								
							
						 | 
						
							
							
								
								差值 差值
							
							
							
							
								
							
							
						 | 
						4 years ago |