sunyuchao
							
						 | 
						
							
							
							
								
							
								7fb2c0fa99
								
							
								
							
						 | 
						
							
							
								
								生产通知已读未读bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a48624a2f
								
							
								
							
						 | 
						
							
							
								
								数据3.0 添加修改权重脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7bcaae2934
								
							
								
							
						 | 
						
							
							
								
								街道级别代码微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								52209fb392
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8fb5a3f10c
								
							
								
							
						 | 
						
							
							
								
								添加脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cf7c2355b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_notic_bug_syc' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								de7694f05b
								
							
								
							
						 | 
						
							
							
								
								日志bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								10a59e830b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_out_group' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								72b485b7bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_topic_locate' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								566c160ad4
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e14725ea65
								
							
								
							
						 | 
						
							
							
								
								community级别 能力指数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9a3907c3d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
#	epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d894dd37e1
								
							
								
							
						 | 
						
							
							
								
								治理指谁网格相关v3: 网格自治占比:本网格内产生的项目,并且一直在网格级流转的项目,从哪出来归谁自治;社区、街道、区直部门解决都是指的,从本网格内出来的项目中,再去看谁解决
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2f4337fdba
								
							
								
							
						 | 
						
							
							
								
								运营端获取小程序草稿箱接口设置按草稿创建时间降序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1656ce8f68
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0933e20a74
								
							
								
							
						 | 
						
							
							
								
								活动。通知用户已读未读状态取VIEW_DETAIL字段值,组长看未读人数取READ_FLAG字段值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								25d4987a95
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c5e6262187
								
							
								
							
						 | 
						
							
							
								
								本级和下级分数 保留一位小数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d8c32d1824
								
							
								
							
						 | 
						
							
							
								
								全区能力指数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a86aaae641
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0a2fcd9de2
								
							
								
							
						 | 
						
							
							
								
								成就轮播修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c434ad6a9c
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6f5c7b5375
								
							
								
							
						 | 
						
							
							
								
								特殊处理下%d
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1045eedced
								
							
								
							
						 | 
						
							
							
								
								street级别 能力指数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ab056ec6c0
								
							
								
							
						 | 
						
							
							
								
								wxcode获取微信信息接口添加日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								48103d32f8
								
							
								
							
						 | 
						
							
							
								
								平均值数量 不格式化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7fd907f093
								
							
								
							
						 | 
						
							
							
								
								少一个网格
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								83de4c20d8
								
							
								
							
						 | 
						
							
							
								
								得分说明 保留分数保留一位小数,权重保留整数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								776e86aa4a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bdabd15c34
								
							
								
							
						 | 
						
							
							
								
								网格相关、区直部门相关,指标计算,改为以screen_customer_grid、screen_customer_dept为主表。当前部门或网格没有原始指标值时,赋值为0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c14e069f77
								
							
								
							
						 | 
						
							
							
								
								居民端个人中心修改手机号操作必须是居民才可以
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ea6d23f43d
								
							
								
							
						 | 
						
							
							
								
								结案项目满意度抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								66ccfbc41f
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4fddf998fb
								
							
								
							
						 | 
						
							
							
								
								得分说明 保留分数保留一位小数,权重保留整数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								284b6e08f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0521yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								513dd6fdef
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5045c664b2
								
							
								
							
						 | 
						
							
							
								
								基层治理-组织的治理指数,按天统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3fa874a0ba
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_party_group_discuss' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_party_group_discuss
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								17eaf21880
								
							
								
							
						 | 
						
							
							
								
								【事件分析】效率分析 排序修改
							
							
							
							
							
							
								
							
							
							公众参与各组织排序修改 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								636fbfd30f
								
							
								
							
						 | 
						
							
							
								
								开发测试机器人地址修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2cf9bb2f01
								
							
								
							
						 | 
						
							
							
								
								党员分数计算时 获取党员指标原始值时以用户Id分组
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c6ba86de55
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e2898b66cc
								
							
								
							
						 | 
						
							
							
								
								网格层级治理指数增加返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0810594957
								
							
								
							
						 | 
						
							
							
								
								治理指数网格表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d11e04b00
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20cc0ad70a
								
							
								
							
						 | 
						
							
							
								
								五级指标抽取,添加monthId校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1884559998
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								09700ffc93
								
							
								
							
						 | 
						
							
							
								
								获取组织机构信息接口增加客户跟组织级别返参用于数据统计治理实况模块使用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6c3a29b07a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_third_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f78c25f68b
								
							
								
							
						 | 
						
							
							
								
								查询平均值的时候,做平均值为null的判断
							
							
							
							
								
							
							
						 | 
						5 years ago |