wangxianzhang
|
5fc67d7d19
|
修改：
1.是否有正在执行的导入任务
|
4 years ago |
jianjun
|
e89de0591f
|
错误信息打印堆栈
|
4 years ago |
|
wangxianzhang
|
1e1f26853b
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
364a865f92
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
7a35bc6e67
|
新增：
1.是否有正在执行的导入任务
|
4 years ago |
yinzuomei
|
cfa47b1b7b
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
82b975c6b4
|
url
|
4 years ago |
|
yinzuomei
|
38db0cdfa8
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
e290f50a78
|
aggopenfeign
|
4 years ago |
zxc
|
29ba32c282
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
2b493a24d7
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
yinzuomei
|
61bdc38bd5
|
aggopenfeign
|
4 years ago |
|
zxc
|
62944b2c8d
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
zxc
|
680336195d
|
提示语
|
4 years ago |
|
yinzuomei
|
2a32b0fa1d
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
4c1473c104
|
每周一执行，取上个自然周
|
4 years ago |
|
yinzuomei
|
266db66c5d
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
yinzuomei
|
cbd729d9dd
|
活跃度导出上传oss发钉钉
|
4 years ago |
|
yinzuomei
|
eda94b5b02
|
temp
|
4 years ago |
|
zxc
|
6845dd2a5e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
dade9d563a
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
zxc
|
ff38e2ba03
|
提示拆分
|
4 years ago |
sunyuchao
|
9f65e00664
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
6a0768866c
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
sunyuchao
|
f5ff0fbcac
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
680327f7de
|
社会自组织导入bug修改
|
4 years ago |
|
zxc
|
880e2c920a
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
b1ab961470
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
|
zxc
|
786c702100
|
bug
|
4 years ago |
|
yinzuomei
|
5d2dcbdb8d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
dda659cd3e
|
榆山发积分
|
4 years ago |
|
yinzuomei
|
9cd3023ef6
|
temp
|
4 years ago |
|
zxc
|
7c2b57fa25
|
楼栋导入新增更新户数
|
4 years ago |
|
sunyuchao
|
7af68bb9f8
|
平阴组织网格项目统计调整引起的查询调整，三个街道的同一组织或网格一天会存在两条统计数据 只是客户Id不同
|
4 years ago |
|
sunyuchao
|
a5602afed2
|
第一版项目统计，平阴数据统计时只统计了五个街道的其他三个是上报的，现在这三个街道在小程序也产生了数据需要统计上，因此修改获取组织网格维度的逻辑 查询的时候平阴的同一天统一组织就会存在两条数据了 就需要sum和了
|
4 years ago |
zhaoqifeng
|
2515047ce4
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
wangxianzhang
|
451d1cf6cc
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
20231f5009
|
Merge branches 'develop' and 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
56ceeaf58b
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
706b91ee31
|
导入任务创建-修改进行中的导入的提示语
|
4 years ago |
|
zxc
|
34af77d0c6
|
提示语
|
4 years ago |
|
wangxianzhang
|
ce5dddfcb0
|
Merge branches 'release_temp' and 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
8ac1f3619c
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
wangxianzhang
|
04f6fc197c
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
b340125289
|
新增脚本
|
4 years ago |
|
zhaoqifeng
|
c6f8f9de7d
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
wangxianzhang
|
9b1c47f235
|
新增脚本
|
4 years ago |
|
zhaoqifeng
|
3256f76f32
|
居民端活动详情
|
4 years ago |
|
zxc
|
60629f6cc7
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
02a9ce63cb
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
