jianjun
|
4c7fc33f49
|
修改逻辑
|
5 years ago |
wxz
|
6f07042657
|
Merge branch 'dev_jar_name' into dev
|
5 years ago |
|
wxz
|
a9ed502baa
|
Merge branch 'dev_jar_name' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
f816e0c3ca
|
Merge branch 'dev_jar_name' into dev_screen_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
117c54a512
|
修改docker配置文件，将app.jar->xxx.jar
|
5 years ago |
|
jianjun
|
91b3516ff0
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
0b4a7ae413
|
加强判断
|
5 years ago |
|
jianjun
|
a3657d869a
|
修改环境变量
|
5 years ago |
|
wxz
|
19f4c135a0
|
版本升级
|
5 years ago |
|
wxz
|
0b8de8f79a
|
Merge branch 'dev_jar_name' into dev_temp
|
5 years ago |
|
wxz
|
62d097893f
|
修改epmet-admin服务的jar名称，由app.jar->epmet-admin.jar
|
5 years ago |
|
jianjun
|
5542664f90
|
部署commonservice
|
5 years ago |
|
jianjun
|
652b45bfa7
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
b7d937f966
|
添加指标计算脚本
|
5 years ago |
zhangyongzhangyong
|
e9a340e440
|
report升级
|
5 years ago |
|
zhangyongzhangyong
|
59f0656497
|
statistical升级
|
5 years ago |
|
zhangyongzhangyong
|
9d7e06bfbd
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
eaa4ec544c
|
年表平均值计算逻辑修改
|
5 years ago |
zxc
|
6e1fa0f0a6
|
小数点位数修改 大屏指数查询公用API
|
5 years ago |
|
zhangyongzhangyong
|
fb52eb0ec5
|
安宁指数 返回1位小数
|
5 years ago |
|
zhangyongzhangyong
|
34fbe09ab5
|
report升级
|
5 years ago |
|
zhangyongzhangyong
|
782c93499e
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
5813c25ea4
|
安宁指数排行，返回2位小数
|
5 years ago |
|
zhangyongzhangyong
|
d8be8c10a4
|
screen_kc_volunteer_heat_rank_grid_daily 表增加字段【积分、志愿者id】
|
5 years ago |
|
jianjun
|
1d84554bdb
|
部署statis
|
5 years ago |
|
jianjun
|
3887221d7d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
wxz
|
88bc86f5fb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wxz
|
d13bf9c484
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
zxc
|
8cedf69308
|
三大能力分数和修改
|
5 years ago |
|
wxz
|
dae03d771f
|
修改：中止计算，停止计算，示例销毁都会清空redis的计算标记
停止计算和中止计算还要清空futureMap
|
5 years ago |
yinzuomei
|
25c0b83b00
|
stats 70
|
5 years ago |
|
yinzuomei
|
ecccd7523e
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
b87b944fc6
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
7a405702bf
|
注释：客户一级指标分值记录不存在
|
5 years ago |
|
wxz
|
62c17e7c7c
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
6acf962060
|
增加终止计算方法
|
5 years ago |
|
jianjun
|
12eee521ca
|
部署statis
|
5 years ago |
|
jianjun
|
e1e9328538
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
9040792b81
|
修改rediskey
|
5 years ago |
|
jianjun
|
b3c67750aa
|
党员分批计算总分
|
5 years ago |
|
zhangyongzhangyong
|
487df340ea
|
heart 升级
|
5 years ago |
|
zhangyongzhangyong
|
f3f169264d
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
wangchao
|
f270088f18
|
data-report log配置添加local环境
|
5 years ago |
|
jianjun
|
49b95d992a
|
部署report
|
5 years ago |
|
jianjun
|
4fe396ba07
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
abdf683674
|
5、下级部门指数排行（目前安宁数据端用）, 返回值增加 orgId
|
5 years ago |
|
jianjun
|
f02aa9c618
|
增大堆内存部署
|
5 years ago |
|
jianjun
|
59e02523de
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
|
5 years ago |
|
jianjun
|
e92c0fe1f3
|
增大堆内存
|
5 years ago |
|
wxz
|
1508518489
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
