Tree: d201ffbc1d

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'd201ffbc1d'

${ noResults }

Commit Graph

9960 Commits (d201ffbc1d15c209e6d62653e45d8017a88eeafc)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	4e0c78c2b7	Merge remote-tracking branch 'remotes/origin/dev'	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	b85e014c6d	bugfix nddd	4 years ago
yinzuomei	fad4cdb731	Merge remote-tracking branch 'origin/dev'	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	1f4455cb60	测试下 使用多线程 提高处理速度 上线	4 years ago
jianjun	0585fff76b	Merge remote-tracking branch 'remotes/origin/dev'	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
yinzuomei	df9eb952e4	大屏难点赌点接口调整发布	4 years ago
yinzuomei	d8004d9954	Merge remote-tracking branch 'origin/dev'	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	83f1d5bd26	修改：网格员数据统计查询，增加排序条件	4 years ago
wxz	6bd490d4f6	修改：网格员数据统计查询，增加排序条件	4 years ago
sunyuchao	483d363692	生产bug修改	4 years ago
sunyuchao	0c66ee1e4c	Merge branch 'dev'	4 years ago
sunyuchao	c6958b768f	Merge branch 'dev_patrol_stats' into dev	4 years ago
sunyuchao	5d405d3ac9	生产bug修改 是否在巡查中状态值错误问题	4 years ago
yinzuomei	ae0901e107	大屏难点赌点列表，处理次数取值错误，改为：EVENT_HANDLED_COUNT	4 years ago
jianjun	fde5d56b41	project 漏掉上线	4 years ago
wxz	48406b2fef	版本升级	4 years ago
wxz	7fff9d669b	版本升级	4 years ago
wxz	115c096983	Merge branch 'dev'	4 years ago
wxz	a66497cf46	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
yinzuomei	73ea070578	bug发布	4 years ago
yinzuomei	4c470f00ef	Merge remote-tracking branch 'origin/dev'	4 years ago
yinzuomei	e53dc0f9e0	基层治理--治理能力，默认按照“响应率降序排列	4 years ago
yinzuomei	32ec19b027	先进支部按党员数降序排列	4 years ago
yinzuomei	2b63fdf60e	submitProjectRelationData修改 +1	4 years ago
yinzuomei	d58ccd5b84	Merge remote-tracking branch 'origin/dev'	4 years ago
yinzuomei	48e5075213	submitProjectRelationData修改	4 years ago
yinzuomei	f16eb38c6f	积分任务上线:resi-mine发布	4 years ago
wxz	a2ca761a1b	将系统日志的权限枚举改为小写	4 years ago
wxz	83e3af6043	升级版本	4 years ago
wxz	837f831418	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	4 years ago
jianjun	cbd6783021	Merge remote-tracking branch 'remotes/origin/dev'	4 years ago
jianjun	d689ef8d85	Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev	4 years ago
wxz	879e49dae8	Merge branch 'dev'	4 years ago
jianjun	8282d4159e	网格员数据相关上线 agg，stats，job，user，access，group	4 years ago