Tree: 31ff8d5f80

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '31ff8d5f80'

${ noResults }

Commit Graph

12178 Commits (31ff8d5f801b76ea3ec839a4ac80859991f245e5)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	1edc1af864	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
yinzuomei	17eb441216	代码合并	4 years ago
yinzuomei	c4279be3dc	Merge remote-tracking branch 'origin/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-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/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/evaluationindex/screen/ScreenCustomerAgencyDao.xml	4 years ago
zhaoqifeng	ebb24fb2ff	Merge branch 'dev_grid_member_statistics' into develop	4 years ago
jianjun	025be3e627	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop	4 years ago
jianjun	36503cbd93	网格员巡查数据统计 脚本更新	4 years ago
jianjun	a305493f91	多客户时参数 调整时间参数	4 years ago
jianjun	651d6d02cd	多客户时参数 bug	4 years ago
jianjun	70183f041a	控制项目变动的消费频率 最小间隔 为30s	4 years ago
jianjun	f02c8dd8f0	加大内存	4 years ago
wxz	70afd65f21	Merge branch 'wxz_feign_datetime' into develop	4 years ago
wxz	8e663e9612	将webmvc的时间暂时改回保留分钟	4 years ago
yinzuomei	c6bbaeec32	增加sync_flag,0:不同步到指标统计库	4 years ago
jianjun	497b7fd162	删除多余代码	4 years ago
jianjun	a2f689e807	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop	4 years ago
jianjun	85e8b36fd0	定时任务修改参数	4 years ago
wxz	603ef5cb56	Merge branch 'wxz_feign_datetime' into develop	4 years ago
wxz	6e5eeb123a	修改：将WebMvcConfig.java中的日期时间格式改为yyyy-mm-dd HH:mm:ss	4 years ago
zhaoqifeng	269285f347	Merge branch 'dev_grid_member_statistics' into develop	4 years ago
zhaoqifeng	a680fb2f61	网格员数据统计	4 years ago
wxz	b14e987f65	Merge branch 'wxz_permission_async' into dev	4 years ago
zhaoqifeng	7536fe271b	Merge branch 'dev_grid_member_statistics' into develop	4 years ago
zhaoqifeng	5c093d64ee	网格员数据统计	4 years ago
zhaoqifeng	f4a5996570	Merge branch 'dev_grid_member_statistics' into develop # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java	4 years ago
zhaoqifeng	e25cdc018b	网格员数据统计	4 years ago
wxz	7eaae8e414	Merge branch 'dev_grid_member_statistics' into develop	4 years ago
wxz	ea4e93117e	修复：网格员数据统计查询逻辑错误，网格员-我的查询条件去掉网格id	4 years ago
wxz	4dddbad6f2	Merge branch 'dev_grid_member_statistics' into develop	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	147e0889b9	Merge branch 'dev_grid_member_statistics' into develop # 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/datastats/impl/DataStatsServiceImpl.java	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	9b07eb31e3	Merge branch 'dev_patrol_stats' into develop	4 years ago
sunyuchao	f005428803	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
sunyuchao	3cf4bc042c	bug修改	4 years ago
zhaoqifeng	d640a5c467	Merge branch 'dev_data_fusion' into develop	4 years ago
zhaoqifeng	acdcd8c423	治理指数数据查询接口修改	4 years ago
sunyuchao	fde8c1c453	Merge branch 'dev_patrol_stats' into develop	4 years ago
sunyuchao	e805f40924	......	4 years ago
jianjun	c56bc7f4e4	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop	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	fd7ac80225	Merge branch 'dev_patrol_stats' into develop	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