wxz
							
						 | 
						
							
							
							
								
							
								94f3ab1fb1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_member_statistics' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c4da1f8bb6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9086b877eb
								
							
								
							
						 | 
						
							
							
								
								网格员统计-权限
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d4d1cc9b59
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8756e3e777
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								75f879fefd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								33f5bf987b
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ad9592dd86
								
							
								
							
						 | 
						
							
							
								
								网格员数据上报接口出版
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fa1279ad3e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_point_task' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0502bead60
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f7fd7b1ed8
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								489c413682
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								064406760a
								
							
								
							
						 | 
						
							
							
								
								dim、screen_agency维度添加SYNC_FLAG='1';"syncorginfo"方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b99c322ef8
								
							
								
							
						 | 
						
							
							
								
								业务校验前置
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b097ef4ece
								
							
								
							
						 | 
						
							
							
								
								CUSTOMER_DEPARTMENT不增加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								73e3fb126f
								
							
								
							
						 | 
						
							
							
								
								网格员数据分析 表添加唯一索引
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								37767d0dff
								
							
								
							
						 | 
						
							
							
								
								网格员数据上报接口模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3815afb494
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6149c964b5
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a305493f91
								
							
								
							
						 | 
						
							
							
								
								多客户时参数 调整时间参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								651d6d02cd
								
							
								
							
						 | 
						
							
							
								
								多客户时参数 bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1e56e0c048
								
							
								
							
						 | 
						
							
							
								
								添加日志排查问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								36503cbd93
								
							
								
							
						 | 
						
							
							
								
								网格员巡查数据统计 脚本更新
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								70183f041a
								
							
								
							
						 | 
						
							
							
								
								控制项目变动的消费频率 最小间隔 为30s
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f02c8dd8f0
								
							
								
							
						 | 
						
							
							
								
								加大内存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c6bbaeec32
								
							
								
							
						 | 
						
							
							
								
								增加sync_flag,0:不同步到指标统计库
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								497b7fd162
								
							
								
							
						 | 
						
							
							
								
								删除多余代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								85e8b36fd0
								
							
								
							
						 | 
						
							
							
								
								定时任务修改参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a680fb2f61
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b14e987f65
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_permission_async' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5c093d64ee
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e25cdc018b
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ea4e93117e
								
							
								
							
						 | 
						
							
							
								
								修复:网格员数据统计查询逻辑错误,网格员-我的查询条件去掉网格id
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								00299bbd18
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_member_statistics' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_member_statistics
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b3b505d3a9
								
							
								
							
						 | 
						
							
							
								
								修改:网格员统计数据列表,修为月份可以不传,不传返回所有月份sum
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9db1dcd66a
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2d08d4e979
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_member_statistics' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_member_statistics
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								89904c5c26
								
							
								
							
						 | 
						
							
							
								
								新增:我的-网格员议题项目统计数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3cf4bc042c
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								acdcd8c423
								
							
								
							
						 | 
						
							
							
								
								治理指数数据查询接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e805f40924
								
							
								
							
						 | 
						
							
							
								
								......
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a01a585c8c
								
							
								
							
						 | 
						
							
							
								
								项目数错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1894916f3f
								
							
								
							
						 | 
						
							
							
								
								网格员数据统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								567c23b9fb
								
							
								
							
						 | 
						
							
							
								
								补充:网格员数据查询,补充del_flag=0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								65a4408338
								
							
								
							
						 | 
						
							
							
								
								新增:网格员统计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a6b49b471f
								
							
								
							
						 | 
						
							
							
								
								工作端-个人中心-网格员巡查记录汇总数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								99522533bf
								
							
								
							
						 | 
						
							
							
								
								代码微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								10524e3811
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_patrol_stats' into dev_grid_member_statistics
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3f515a9991
								
							
								
							
						 | 
						
							
							
								
								任务参数问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								838dd04a0f
								
							
								
							
						 | 
						
							
							
								
								agencydetail-multic
							
							
							
							
								
							
							
						 | 
						4 years ago |