sunyuchao
|
c6958b768f
|
Merge branch 'dev_patrol_stats' into dev
|
4 years ago |
|
sunyuchao
|
109cf853bf
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
5d405d3ac9
|
生产bug修改 是否在巡查中状态值错误问题
|
4 years ago |
yinzuomei
|
ae0901e107
|
大屏难点赌点列表，处理次数取值错误，改为：EVENT_HANDLED_COUNT
|
4 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
|
4 years ago |
wxz
|
a66497cf46
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
e53dc0f9e0
|
基层治理--治理能力，默认按照“响应率降序排列
|
4 years ago |
|
yinzuomei
|
32ec19b027
|
先进支部按党员数降序排列
|
4 years ago |
|
yinzuomei
|
48e5075213
|
submitProjectRelationData修改
|
4 years ago |
|
wxz
|
a2ca761a1b
|
将系统日志的权限枚举改为小写
|
4 years ago |
jianjun
|
d689ef8d85
|
Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev
|
4 years ago |
|
wxz
|
94f3ab1fb1
|
Merge branch 'dev_grid_member_statistics' into dev
|
4 years ago |
|
wxz
|
c4da1f8bb6
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
235e3dd3c6
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
wxz
|
9086b877eb
|
网格员统计-权限
|
4 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
|
4 years ago |
|
jianjun
|
8756e3e777
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into dev
|
4 years ago |
zhaoqifeng
|
61f17f11d2
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
jianjun
|
75f879fefd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
33f5bf987b
|
网格员数据统计
|
4 years ago |
|
sunyuchao
|
ad9592dd86
|
网格员数据上报接口出版
|
4 years ago |
|
yinzuomei
|
fa1279ad3e
|
Merge remote-tracking branch 'origin/dev_point_task' into dev
|
4 years ago |
|
jianjun
|
a3ea044f79
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
0502bead60
|
加强判断
|
4 years ago |
|
yinzuomei
|
f7fd7b1ed8
|
bugfix
|
4 years ago |
|
zhaoqifeng
|
489c413682
|
网格员数据统计
|
4 years ago |
|
yinzuomei
|
064406760a
|
dim、screen_agency维度添加SYNC_FLAG='1';"syncorginfo"方法
|
4 years ago |
|
jianjun
|
b99c322ef8
|
业务校验前置
|
4 years ago |
|
yinzuomei
|
b097ef4ece
|
CUSTOMER_DEPARTMENT不增加
|
4 years ago |
|
jianjun
|
73e3fb126f
|
网格员数据分析 表添加唯一索引
|
4 years ago |
|
sunyuchao
|
37767d0dff
|
网格员数据上报接口模板
|
4 years ago |
|
jianjun
|
f1c8a4aaab
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
3815afb494
|
加强判断
|
4 years ago |
|
jianjun
|
6149c964b5
|
加强判断
|
4 years ago |
|
jianjun
|
c87a4d686c
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
6e17836709
|
错误修复
|
4 years ago |
|
jianjun
|
b9b5a6de5c
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
1e56e0c048
|
添加日志排查问题
|
4 years ago |
|
yinzuomei
|
85c7d0b8dd
|
Merge remote-tracking branch 'origin/dev_gridmember_fusion' into develop
|
4 years ago |
|
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 |
