zxc
|
acf91a9269
|
用户summaryInfo
|
5 years ago |
wxz
|
836bf3fd49
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
zxc
|
b478d23921
|
数据统计pid修改
|
5 years ago |
wangchao
|
09f8eb9bce
|
修复创建小组后组信息（缓存）有误的问题
|
5 years ago |
jianjun
|
123f477317
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
fdb776d854
|
版本号+1
|
5 years ago |
|
jianjun
|
2676d15ea2
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
zxc
|
e72f36df51
|
数据统计修改
|
5 years ago |
|
jianjun
|
fa99295fbe
|
count变sum
|
5 years ago |
|
jianjun
|
e7a0ded7c9
|
版本号+1
|
5 years ago |
|
jianjun
|
641bd6b7e9
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
722987fa2b
|
self的pid 是它本身
|
5 years ago |
|
jianjun
|
9f31710670
|
版本号+1
|
5 years ago |
|
jianjun
|
a6e065ebe1
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
wangchao
|
102f09e2b6
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
wangchao
|
51259c56fd
|
话题统计调整，修复没有网格的机关没有统计数据的问题
|
5 years ago |
jiangyuying
|
d6ea012ea6
|
宣传能力--count变为sum
|
5 years ago |
yinzuomei
|
693bb791f9
|
datareport版本号升级：0.3.11
|
5 years ago |
|
yinzuomei
|
21bd8c8c02
|
Merge branches 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
yinzuomei
|
e3f2867e92
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
yinzuomei
|
8b85794225
|
新增：/data/report/user/checksublist接口
|
5 years ago |
|
jianjun
|
e4afe22101
|
版本号+1
|
5 years ago |
|
jianjun
|
7defc80549
|
版本号+1
|
5 years ago |
|
jianjun
|
de7436b07a
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
zxc
|
dfc78dea27
|
数据统计修改
|
5 years ago |
|
zxc
|
1c4798d086
|
数据统计修改
|
5 years ago |
|
jiangyuying
|
1d49966667
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jiangyuying
|
251db3d7a2
|
宣传能力--type修改和下级机关去除self
|
5 years ago |
|
wangchao
|
1e79e5e8a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wangchao
|
7d44e82efc
|
job服务、数据服务版本号+1
|
5 years ago |
|
wangchao
|
120a03c985
|
Merge branch 'dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
98565f12a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
0f4a434bdd
|
限制钉钉消息发送数量
|
5 years ago |
|
wangchao
|
2a3bb4deab
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
wangchao
|
95de02eb92
|
修改定时任务可以通过页面传参
|
5 years ago |
zhaoqifeng
|
9627303f77
|
议题统计修改
|
5 years ago |
|
wxz
|
00ec8e0a0e
|
版本升级
|
5 years ago |
|
wxz
|
aeed8f08a5
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
wxz
|
7cae081cb1
|
Merge branch 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
wxz
|
763fddf71d
|
调整日期维度初始化，初始化到任务执行当天
|
5 years ago |
sunyuchao
|
d28a0813be
|
议题、项目服务升级
|
5 years ago |
|
sunyuchao
|
f3e5ae3c0b
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
4686aafc9e
|
因分布式事务问题，议题转项目接口添加数据判断
|
5 years ago |
|
zxc
|
54fb0b27f0
|
数据统计修改
|
5 years ago |
|
wangchao
|
cdc1ac701e
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
|
5 years ago |
|
wangchao
|
93d4bfbe8d
|
用户定时任务调整，热心居民去重
|
5 years ago |
|
jianjun
|
0009ef4b8d
|
版本号+1
|
5 years ago |
|
jianjun
|
1c2daabc59
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
8b861db5bd
|
error日志统一处理
|
5 years ago |
|
jianjun
|
28bbc62285
|
版本号+1
|
5 years ago |
