jianjun
|
dbbdd9bbd4
|
升级report，statis
|
5 years ago |
|
jianjun
|
6e65c7e71c
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
|
5 years ago |
|
jianjun
|
18b6004a0b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
wxz
|
21f7d96164
|
动态数据源增加数据源名称日志
|
5 years ago |
|
wxz
|
8b3436d429
|
动态数据源增加数据源名称日志
|
5 years ago |
yinzuomei
|
a7ebeffb70
|
孔村添加两个外部应用
|
5 years ago |
sunyuchao
|
02a48a1965
|
孔村大屏接口
|
5 years ago |
zxc
|
650736038c
|
三大能力乘上对应权重，四舍五入提出公共方法
|
5 years ago |
|
sunyuchao
|
8c0e505c4c
|
名称修改
|
5 years ago |
|
sunyuchao
|
80c0e6c2d2
|
孔村-首页-平台各类总数
|
5 years ago |
|
wxz
|
8c18b0b7dc
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
bfa0bca476
|
增加暂停的统计，重新处理
|
5 years ago |
|
wxz
|
728894ac33
|
版本升级
|
5 years ago |
|
wxz
|
8e1e9c1d71
|
版本升级
|
5 years ago |
|
zxc
|
c60bf56070
|
sql修改
|
5 years ago |
|
yinzuomei
|
cd038cf355
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
0d2e1c7cb6
|
/data/stats/kcscreencoll/news/trend 接口入参去掉readCount，screen_kc_news_trend_monthly表去掉read_count
|
5 years ago |
wangchao
|
df7503512e
|
point +1 resi-mine +1
|
5 years ago |
|
wangchao
|
f642f245f1
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
jianjun
|
cbe689e1df
|
修改错误
|
5 years ago |
|
wangchao
|
86b01e9175
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
wxz
|
b2d2567642
|
重新计算方法增加返回值
|
5 years ago |
|
jianjun
|
406f3d20e9
|
修改错误
|
5 years ago |
|
jianjun
|
0243c686cb
|
部署消息通知排除本地的
|
5 years ago |
|
jianjun
|
174358f68f
|
批量归一算法 返回原始值
|
5 years ago |
|
jianjun
|
8f507bbd35
|
批量归一算法 返回原始值
|
5 years ago |
zhangyongzhangyong
|
634d8976b3
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
zhangyongzhangyong
|
fd0ffe0a4c
|
指数 - 年表，计算，乘以权重
|
5 years ago |
|
wxz
|
b4254b09f9
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wxz
|
2595269922
|
新增：数据统计-重新执行所有pendding中的计算
|
5 years ago |
|
jianjun
|
d5b1c5a225
|
批量归一算法 返回原始值
|
5 years ago |
|
wxz
|
7f877642b9
|
版本升级
|
5 years ago |
|
zxc
|
2c4b5c7dd1
|
指标优化
|
5 years ago |
|
wxz
|
96dfc60bcd
|
Merge branch 'master_bugfix'
|
5 years ago |
|
wangchao
|
caee1c7eb3
|
党员年龄分布，修改返回为NaN的情况
|
5 years ago |
|
zxc
|
f34031f358
|
sql修改
|
5 years ago |
|
wangchao
|
51f7ebeb6a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
zxc
|
0bcdd40b77
|
sql优化
|
5 years ago |
|
jianjun
|
807375e91f
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
6d140ff115
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
yinzuomei
|
0e5a5ce4ca
|
Merge branches 'master' and 'master_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into master_bugfix
|
5 years ago |
|
zhangyongzhangyong
|
d82f6bfb57
|
部门权重值 修改
|
5 years ago |
|
zhangyongzhangyong
|
7b95a70e46
|
赋默认值
|
5 years ago |
|
zhangyongzhangyong
|
fac7c50e55
|
部门 权重值特殊处理
|
5 years ago |
|
jianjun
|
5824179dd1
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
c5e2a42abd
|
添加权重
|
5 years ago |
|
zhangyongzhangyong
|
b815c55569
|
撤销
|
5 years ago |
|
jianjun
|
252bb39088
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
b0d8c36023
|
添加权重
|
5 years ago |
|
zhangyongzhangyong
|
3d1e651805
|
处理权重 值为null
|
5 years ago |
