jianjun
|
4ac8998d26
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
1c895a9712
|
我也是无敌了
|
4 years ago |
|
jianjun
|
3bd204d219
|
sql 起别名 上线
|
4 years ago |
|
jianjun
|
84ae83df16
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
f381a48fa6
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
f3aa032462
|
sql 起别名
|
4 years ago |
|
jianjun
|
a6f38f3f26
|
null上线
|
4 years ago |
|
jianjun
|
9ced55f184
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
70b3244fa8
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
675d0574bf
|
终于找到精髓
|
4 years ago |
|
jianjun
|
1f6e7ed3cf
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
fd10b15cbb
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
14d5ef825a
|
sql加强判断
|
4 years ago |
sunyuchao
|
dcc579b617
|
数据库连接密码错误问题
|
4 years ago |
|
sunyuchao
|
615d348ee3
|
数据库连接密码错误问题
|
4 years ago |
|
sunyuchao
|
eab341d02c
|
第三版数据合生产
|
4 years ago |
|
jianjun
|
8367ce15ec
|
这些脚本已执行
|
4 years ago |
|
jianjun
|
8ee363bdc6
|
数据3.0上线
|
4 years ago |
|
jianjun
|
3b436e8050
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
7b561fb3b6
|
先进支部排行查询的是网格 所以关联grid即可
|
4 years ago |
|
jianjun
|
5b323b6fde
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
05d723349b
|
dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
f0b967cddb
|
代码瑕疵上线
|
4 years ago |
|
jianjun
|
ae76ff0176
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
182e232539
|
如果数据id为空 再继续下个月的查询
|
4 years ago |
zhaoqifeng
|
3d7acb2ac7
|
党员先锋统计修改
|
4 years ago |
yinzuomei
|
eaf2a214fc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
a7358e9642
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev
|
4 years ago |
|
yinzuomei
|
981863afb7
|
网格员数据向上汇聚
|
4 years ago |
|
yinzuomei
|
7245ab1af5
|
平阴大屏：新增两个查询接口，内部抽取screen_user_total_data新增GRID_MEMBER_TOTAL列。上线
|
4 years ago |
|
yinzuomei
|
ba5d610a1a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
438270083f
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev
|
4 years ago |
|
yinzuomei
|
d0c4a4d835
|
screen_user_total_data新增GRID_MEMBER_TOTAL网格员数抽取逻辑
|
4 years ago |
|
sunyuchao
|
35997c05b3
|
小组成就-组内贡献榜bug修改
|
4 years ago |
|
sunyuchao
|
c972cb7774
|
Merge branch 'dev'
|
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 |
|
jianjun
|
9dbbbf1cd6
|
查询先进**排行 关联组织
|
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
|
6886ffd0ad
|
党员先锋-下级组织排行修改
|
4 years ago |
|
jianjun
|
f605590fa8
|
查询先进排行关联组织
|
4 years ago |
wxz
|
fee63064d9
|
版本升级
|
4 years ago |
|
wxz
|
5432fffc04
|
Merge branch 'dev_fix_dim'
|
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 |
