Tree: a2dc3ab7b2

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'a2dc3ab7b2'

${ noResults }

Commit Graph

11670 Commits (a2dc3ab7b29b79e2f2c8dd7dfa4cde88a1fb6fc1)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	d8268745e5	screen_user_join表数据抽取	4 years ago
jianjun	b65b3e2aaa	网格员巡查 适应 数据融合调整	4 years ago
sunyuchao	6e802b25e5	Merge branch 'dev_oper_role' into develop	4 years ago
sunyuchao	c5b5e9c735	运营默认权限和客户权限功能名称保持统一排序规则	4 years ago
yinzuomei	51731c6d61	Merge remote-tracking branch 'origin/dev_08bugfix' into dev	4 years ago
yinzuomei	1a1c0c8f10	screen_project_data表采集projectCreateTime修改2	4 years ago
jianjun	8059011ffb	公众参与概括抽取 添加分子分母脚本	4 years ago
yinzuomei	9b443911db	screen_project_data表采集projectCreateTime修改	4 years ago
yinzuomei	c1904f3856	Merge remote-tracking branch 'origin/dev_data_fusion' into develop	4 years ago
yinzuomei	76242aad66	难点赌点查询修改，写死areaCode=370124时按照areaCode查询，其余的按照agencyId	4 years ago
sunyuchao	144eb5e351	Merge branch 'dev_oper_role' into dev	4 years ago
yinzuomei	155a0aefbb	难点赌点sql修改	4 years ago
sunyuchao	ee09c5a914	版本晚上线，删除脚本手动执行	4 years ago
zhaoqifeng	4f9aa367db	Merge branch 'dev_bugfix_ljj' into develop # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java	4 years ago
sunyuchao	0fbad9d495	Merge branch 'dev_oper_role' into dev	4 years ago
zhaoqifeng	2578794caf	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj	4 years ago
zhaoqifeng	ce2629707f	治理能力排行-日统计修改	4 years ago
yinzuomei	f1a4e07f4a	Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join	4 years ago
yinzuomei	b7ebeb3da7	公众参与概况publicpartiprofile接口调整	4 years ago
jianjun	dad42b3f4a	Merge remote-tracking branch 'remotes/origin/dev_public_join' into develop # Conflicts: # epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml	4 years ago
jianjun	13375eba12	公众参与概括抽取 添加分子分母	4 years ago
yinzuomei	0ab807c1f4	平阴县查看先锋模范数据sql修改	4 years ago
yinzuomei	90ff95a3dc	Merge branches 'dev' and 'dev_0707bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_0707bugfix	4 years ago
yinzuomei	1c3660df91	/data/stats/screencoll/pioneerdata先锋模范采集接口保存分母	4 years ago
sunyuchao	53985adabc	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
sunyuchao	240d977050	瓜皮子	4 years ago
yinzuomei	3aa52560e2	Merge remote-tracking branch 'origin/dev_0707bugfix' into develop	4 years ago
yinzuomei	0f3a2f46f9	暂存-先锋模范抽取	4 years ago
sunyuchao	7b199a6fbd	Merge branch 'dev_gridmember_fusion' into develop # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java # 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/service/user/UserService.java	4 years ago
sunyuchao	3d3457e52a	Merge remote-tracking branch 'origin/dev_gridmember_fusion' into dev_gridmember_fusion	4 years ago
sunyuchao	c85e554b91	网格员数据分析上报接口调整	4 years ago
jianjun	0ed743ff04	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	0277ff6109	parentId 为空 因为网格可能被删除了	4 years ago
yinzuomei	c326c79955	bug	4 years ago
zhaoqifeng	742a030bc9	fact_grid_member_statistics_daily表添加字段	4 years ago
yinzuomei	bd3549af23	暂存	4 years ago
sunyuchao	e0c38361e6	fact_grid_member_statistics_daily表新增字段	4 years ago
sunyuchao	a0a783cec7	网格员事件总数上报接口调整	4 years ago
sunyuchao	ddd9aec85b	巡查stats_staff_patrol_record_daily表添加字段	4 years ago
jianjun	c20293f3bb	测试下 使用多线程	4 years ago
sunyuchao	2f384fb2b6	拽一拽dev	4 years ago
sunyuchao	595c867947	Merge branches 'dev' and 'dev_gridmember_fusion' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_gridmember_fusion Conflicts: epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java 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/user/UserDao.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml	4 years ago
jianjun	8aff874c88	测试下 使用多线程	4 years ago
jianjun	d043854c85	测试下 使用多线程	4 years ago
wxz	f59323a72a	Merge branch 'wxz_feign_datetime' into develop	4 years ago
wxz	fa1ad97aed	修改：WebMvcCOnfig修改日志格式转换器为yyyy-MM-dd HH:mnm:ss	4 years ago
yinzuomei	725e15d2ad	Merge remote-tracking branch 'origin/dev_0707bugfix' into dev	4 years ago
yinzuomei	f17479b3ef	大屏难点赌点列表，如果是根据areaCode查询，限制住状态为处理中：EVENT_STATUS_CODE in('pending','0'),并且是来源于网格的项目	4 years ago
yinzuomei	15dfbea777	先锋模范查询修改：只有入参为370124时，写死查询8各街道的平均数，其余的全部按照agencyId查询。	4 years ago
wxz	6d6cc6b741	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago