Tree: 7b199a6fbd

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '7b199a6fbd'

${ noResults }

Commit Graph

11285 Commits (7b199a6fbd7cd9da77384fdbd9c7e5cbb6cf650c)

 

All Branches   

Search

Author	SHA1	Message	Date
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	5 years ago
sunyuchao	3d3457e52a	Merge remote-tracking branch 'origin/dev_gridmember_fusion' into dev_gridmember_fusion	5 years ago
sunyuchao	c85e554b91	网格员数据分析上报接口调整	5 years ago
zhaoqifeng	742a030bc9	fact_grid_member_statistics_daily表添加字段	5 years ago
sunyuchao	e0c38361e6	fact_grid_member_statistics_daily表新增字段	5 years ago
sunyuchao	a0a783cec7	网格员事件总数上报接口调整	5 years ago
sunyuchao	ddd9aec85b	巡查stats_staff_patrol_record_daily表添加字段	5 years ago
sunyuchao	2f384fb2b6	拽一拽dev	5 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	5 years ago
wxz	f59323a72a	Merge branch 'wxz_feign_datetime' into develop	5 years ago
wxz	fa1ad97aed	修改：WebMvcCOnfig修改日志格式转换器为yyyy-MM-dd HH:mnm:ss	5 years ago
yinzuomei	725e15d2ad	Merge remote-tracking branch 'origin/dev_0707bugfix' into dev	5 years ago
yinzuomei	f17479b3ef	大屏难点赌点列表，如果是根据areaCode查询，限制住状态为处理中：EVENT_STATUS_CODE in('pending','0'),并且是来源于网格的项目	5 years ago
yinzuomei	15dfbea777	先锋模范查询修改：只有入参为370124时，写死查询8各街道的平均数，其余的全部按照agencyId查询。	5 years ago
wxz	6d6cc6b741	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	5 years ago
wxz	9cdfb7bac1	Merge branch 'wxz_gmd_sort' into develop	5 years ago
wxz	83f1d5bd26	修改：网格员数据统计查询，增加排序条件	5 years ago
wxz	6bd490d4f6	修改：网格员数据统计查询，增加排序条件	5 years ago
sunyuchao	c6958b768f	Merge branch 'dev_patrol_stats' into dev	5 years ago
sunyuchao	109cf853bf	Merge branch 'dev_patrol_stats' into develop	5 years ago
sunyuchao	5d405d3ac9	生产bug修改 是否在巡查中状态值错误问题	5 years ago
yinzuomei	ae0901e107	大屏难点赌点列表，处理次数取值错误，改为：EVENT_HANDLED_COUNT	5 years ago
sunyuchao	217ecff0a4	Merge branch 'dev_gridmember_fusion' into develop # Conflicts: # 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	5 years ago
wxz	a66497cf46	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	5 years ago
yinzuomei	e53dc0f9e0	基层治理--治理能力，默认按照“响应率降序排列	5 years ago
yinzuomei	32ec19b027	先进支部按党员数降序排列	5 years ago
yinzuomei	48e5075213	submitProjectRelationData修改	5 years ago
wxz	a2ca761a1b	将系统日志的权限枚举改为小写	5 years ago
jianjun	d689ef8d85	Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev	5 years ago
wxz	94f3ab1fb1	Merge branch 'dev_grid_member_statistics' into dev	5 years ago
wxz	c4da1f8bb6	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	5 years ago
wxz	235e3dd3c6	Merge branch 'dev_grid_member_statistics' into develop	5 years ago
wxz	9086b877eb	网格员统计-权限	5 years ago
jianjun	d4d1cc9b59	Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java	5 years ago
jianjun	8756e3e777	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into dev	5 years ago
zhaoqifeng	61f17f11d2	Merge branch 'dev_grid_member_statistics' into develop	5 years ago
jianjun	75f879fefd	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	5 years ago
zhaoqifeng	33f5bf987b	网格员数据统计	5 years ago
sunyuchao	ad9592dd86	网格员数据上报接口出版	5 years ago
yinzuomei	fa1279ad3e	Merge remote-tracking branch 'origin/dev_point_task' into dev	5 years ago
jianjun	a3ea044f79	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop	5 years ago
jianjun	0502bead60	加强判断	5 years ago
yinzuomei	f7fd7b1ed8	bugfix	5 years ago
zhaoqifeng	489c413682	网格员数据统计	5 years ago
yinzuomei	064406760a	dim、screen_agency维度添加SYNC_FLAG='1';"syncorginfo"方法	5 years ago
jianjun	b99c322ef8	业务校验前置	5 years ago
yinzuomei	b097ef4ece	CUSTOMER_DEPARTMENT不增加	5 years ago
jianjun	73e3fb126f	网格员数据分析 表添加唯一索引	5 years ago
sunyuchao	37767d0dff	网格员数据上报接口模板	5 years ago
jianjun	f1c8a4aaab	Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop	5 years ago