Tree: 1edc1af864

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1edc1af864'

${ noResults }

Commit Graph

11228 Commits (1edc1af86441d3340e679e77c5d986edb44f421c)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	438270083f	Merge remote-tracking branch 'origin/screen_project_data_0601' into dev	4 years ago
yinzuomei	271ac8b13f	Merge remote-tracking branch 'origin/screen_project_data_0601' into dev_temp # 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	4 years ago
yinzuomei	d0c4a4d835	screen_user_total_data新增GRID_MEMBER_TOTAL网格员数抽取逻辑	4 years ago
zxc	eb0ebb5f0e	Merge branch 'screen_project_data_0601' into dev_temp	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
zxc	7a1c32bd6f	Merge branch 'screen_project_data_0601' into dev_temp	4 years ago
jianjun	33ffa395a1	Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp	4 years ago
jianjun	9dbbbf1cd6	查询先进**排行 关联组织	4 years ago
jianjun	f12a95f4b3	Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp	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	ea0cdd2d3a	Merge branch 'dev_third_data' into dev_temp	4 years ago
zhaoqifeng	6886ffd0ad	党员先锋-下级组织排行修改	4 years ago
jianjun	eaeac523f5	Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp	4 years ago
jianjun	f605590fa8	查询先进排行关联组织	4 years ago
wxz	5c5db057b0	Merge branch 'dev_fix_dim' into dev_temp	4 years ago
wxz	7280c167f0	Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim	4 years ago
wxz	9846a04006	修复：agency,grid,dept的del_flag改为1的时候，指标库的相关维度表不更新del_flag的问题	4 years ago
zxc	96dd6b945f	红黄绿事件修改	4 years ago
zxc	ec88b107f4	streetdetail-py 红黄绿事件	4 years ago
jianjun	e7ce22c9d7	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	4 years ago
jianjun	93c9d33072	查询下级等级指标分数关联组织	4 years ago
jianjun	b702f989f2	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	4 years ago
jianjun	8668d94b76	查询下级等级指标分数关联组织	4 years ago
jianjun	011451e014	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	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	ae92d5d234	Merge remote-tracking branch 'origin/dev_temp' into dev_temp	4 years ago
jianjun	e8573f8ca1	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	4 years ago
jianjun	49c461ecee	查询下级等级指标分数关联组织	4 years ago
zhaoqifeng	c1141ee0ee	Merge branch 'dev_point_rank_bugfix' into dev_temp	4 years ago
zhaoqifeng	8311d35774	小组积分排行bug修改	4 years ago
wxz	ee7c8038ca	Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim	4 years ago
jianjun	b518285651	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	4 years ago
jianjun	1de35ecc5c	网格级的保留小数	4 years ago
jianjun	8934db060e	Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp	4 years ago
jianjun	bb440a72e8	本级及下级分数保留一位小数返回	4 years ago
yinzuomei	c6c1f05d8b	/data/stats/screencoll/usertotaldata新增gridMemberTotal	4 years ago
zxc	948eb789f5	组内近十条消息	4 years ago
jianjun	a047fed6c6	Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp	4 years ago
jianjun	d21fc7bf3f	保留小数处理	4 years ago
zhaoqifeng	29f60c8908	Merge branch 'dev_third_data' into dev_temp	4 years ago
zhaoqifeng	6e5b67eff9	基层治理-组织的治理指数，按天统计	4 years ago
sunyuchao	fc240f94da	Merge branch 'dev_third_data' into dev_temp	4 years ago
sunyuchao	ea1945336d	bug修改	4 years ago