jianjun
|
15b8ac1025
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
14d5ef825a
|
sql加强判断
|
4 years ago |
|
jianjun
|
b9b1637463
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
# Conflicts:
# 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/org/StatsCustomerAgencyDao.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/org/StatsCustomerAgencyDao.xml
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
jianjun
|
2b1ac67340
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
7b561fb3b6
|
先进支部排行查询的是网格 所以关联grid即可
|
4 years ago |
|
jianjun
|
ba8964d9b9
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
05d723349b
|
dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
ebda5c227b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
182e232539
|
如果数据id为空 再继续下个月的查询
|
4 years ago |
zhaoqifeng
|
558c664306
|
Merge branch 'dev_point_rank_bugfix' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
387d860506
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
3d7acb2ac7
|
党员先锋统计修改
|
4 years ago |
wxz
|
c67816077a
|
修改nacos,dev和local环境注册的namespace
|
4 years ago |
yinzuomei
|
a7358e9642
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev
|
4 years ago |
|
yinzuomei
|
5858cb19d3
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev_temp
|
4 years ago |
|
yinzuomei
|
981863afb7
|
网格员数据向上汇聚
|
4 years ago |
|
wxz
|
5395c4b60a
|
修改dev和local配置，调整到140
|
4 years ago |
|
wxz
|
4578fb1baf
|
调整开发环境配置
|
4 years ago |
|
yinzuomei
|
438270083f
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev
|
4 years ago |
|
yinzuomei
|
271ac8b13f
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev_temp
# Conflicts:
# 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/org/StatsCustomerAgencyDao.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/org/StatsCustomerAgencyDao.xml
|
4 years ago |
|
yinzuomei
|
d0c4a4d835
|
screen_user_total_data新增GRID_MEMBER_TOTAL网格员数抽取逻辑
|
4 years ago |
zxc
|
eb0ebb5f0e
|
Merge branch 'screen_project_data_0601' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
8c14aa3fc8
|
Merge branch 'dev_point_rank_bugfix' into dev
|
4 years ago |
|
zhaoqifeng
|
21e5d95b4c
|
小组成员积分排行bug修改
|
4 years ago |
|
yinzuomei
|
12bcd65af0
|
平阴大屏网格员数，新增一列。脚本上传
|
4 years ago |
|
zxc
|
54ae4f9ec7
|
街道：注册党员数、网格数、网格员数查询字段修改
|
4 years ago |
|
zxc
|
e3e5fce2fb
|
中央区事件分析-项目分布修改查询时间
|
4 years ago |
|
zxc
|
61942ef747
|
红黄绿事件修改查询时间，统一改为查询一个月
|
4 years ago |
|
zxc
|
7a1c32bd6f
|
Merge branch 'screen_project_data_0601' into dev_temp
|
4 years ago |
|
jianjun
|
33ffa395a1
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
9dbbbf1cd6
|
查询先进**排行 关联组织
|
4 years ago |
|
jianjun
|
f12a95f4b3
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
f3c03897b9
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
4 years ago |
|
jianjun
|
49304c1c0d
|
查询先进排行关联组织
|
4 years ago |
|
zhaoqifeng
|
ea0cdd2d3a
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
6886ffd0ad
|
党员先锋-下级组织排行修改
|
4 years ago |
|
jianjun
|
eaeac523f5
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
f605590fa8
|
查询先进排行关联组织
|
4 years ago |
|
wxz
|
5c5db057b0
|
Merge branch 'dev_fix_dim' into dev_temp
|
4 years ago |
|
wxz
|
7280c167f0
|
Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim
|
4 years ago |
|
wxz
|
9846a04006
|
修复：agency,grid,dept的del_flag改为1的时候，指标库的相关维度表不更新del_flag的问题
|
4 years ago |
|
zxc
|
96dd6b945f
|
红黄绿事件修改
|
4 years ago |
|
zxc
|
ec88b107f4
|
streetdetail-py
红黄绿事件
|
4 years ago |
|
jianjun
|
e7ce22c9d7
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
93c9d33072
|
查询下级等级指标分数关联组织
|
4 years ago |
|
jianjun
|
b702f989f2
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
8668d94b76
|
查询下级等级指标分数关联组织
|
4 years ago |
|
jianjun
|
011451e014
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
f84f78e8fd
|
查询下级等级指标分数关联组织接口错误
|
4 years ago |
|
wxz
|
a536f16146
|
Merge branches 'dev' and 'dev_party_group_discuss' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_party_group_discuss
|
4 years ago |
