Tree: f2f79f6943

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'f2f79f6943'

${ noResults }

Commit Graph

8976 Commits (f2f79f69430e7875f4b34b5ebd4a1d46eb60da2d)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	675d0574bf	终于找到精髓	4 years ago
jianjun	1f6e7ed3cf	逻辑加强判断	4 years ago
jianjun	fd10b15cbb	逻辑加强判断	4 years ago
jianjun	14d5ef825a	sql加强判断	4 years ago
jianjun	b9b1637463	Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java	4 years ago
jianjun	7b561fb3b6	先进支部排行查询的是网格 所以关联grid即可	4 years ago
jianjun	05d723349b	dev_bugfix_ljj	4 years ago
jianjun	182e232539	如果数据id为空 再继续下个月的查询	4 years ago
zhaoqifeng	3d7acb2ac7	党员先锋统计修改	4 years ago
yinzuomei	a7358e9642	Merge remote-tracking branch 'origin/screen_project_data_0601' into dev	4 years ago
yinzuomei	981863afb7	网格员数据向上汇聚	4 years ago
yinzuomei	438270083f	Merge remote-tracking branch 'origin/screen_project_data_0601' into dev	4 years ago
yinzuomei	d0c4a4d835	screen_user_total_data新增GRID_MEMBER_TOTAL网格员数抽取逻辑	4 years ago
zhaoqifeng	8c14aa3fc8	Merge branch 'dev_point_rank_bugfix' into dev	4 years ago
zhaoqifeng	21e5d95b4c	小组成员积分排行bug修改	4 years ago
yinzuomei	12bcd65af0	平阴大屏网格员数，新增一列。脚本上传	4 years ago
zxc	54ae4f9ec7	街道：注册党员数、网格数、网格员数查询字段修改	4 years ago
zxc	e3e5fce2fb	中央区事件分析-项目分布修改查询时间	4 years ago
zxc	61942ef747	红黄绿事件修改查询时间，统一改为查询一个月	4 years ago
jianjun	9dbbbf1cd6	查询先进**排行 关联组织	4 years ago
jianjun	f3c03897b9	Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data	4 years ago
jianjun	49304c1c0d	查询先进排行关联组织	4 years ago
zhaoqifeng	6886ffd0ad	党员先锋-下级组织排行修改	4 years ago
jianjun	f605590fa8	查询先进排行关联组织	4 years ago
zxc	96dd6b945f	红黄绿事件修改	4 years ago
zxc	ec88b107f4	streetdetail-py 红黄绿事件	4 years ago
jianjun	93c9d33072	查询下级等级指标分数关联组织	4 years ago
jianjun	8668d94b76	查询下级等级指标分数关联组织	4 years ago
jianjun	f84f78e8fd	查询下级等级指标分数关联组织接口错误	4 years ago
wxz	a536f16146	Merge branches 'dev' and 'dev_party_group_discuss' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_party_group_discuss	4 years ago
jianjun	49c461ecee	查询下级等级指标分数关联组织	4 years ago
zhaoqifeng	8311d35774	小组积分排行bug修改	4 years ago
jianjun	1de35ecc5c	网格级的保留小数	4 years ago
jianjun	bb440a72e8	本级及下级分数保留一位小数返回	4 years ago
yinzuomei	c6c1f05d8b	/data/stats/screencoll/usertotaldata新增gridMemberTotal	4 years ago
zxc	948eb789f5	组内近十条消息	4 years ago
jianjun	d21fc7bf3f	保留小数处理	4 years ago
zhaoqifeng	6e5b67eff9	基层治理-组织的治理指数，按天统计	4 years ago
sunyuchao	ea1945336d	bug修改	4 years ago
jianjun	4cc170e377	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_third_data # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml	4 years ago
sunyuchao	714375e75f	解决缓存中user的showname和组员member中usershowname没值的问题	4 years ago
zhaoqifeng	fd6989e4ff	基层治理-组织的治理指数，按天统计	4 years ago
yinzuomei	8745b52bf0	组织层级治理指数table语句，取消注释。	4 years ago
jianjun	6dd54db032	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	94df654ce7	空指针	4 years ago
jianjun	dc82133696	空指针	4 years ago
jianjun	50eae57f37	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	a74b652378	代码微调	4 years ago
jianjun	6524ec2be0	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	7d5ebc0421	正负相关一直没起作用的bug	4 years ago