wangchao
|
3054940803
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
1c688d7b43
|
项目历时统计相关
|
5 years ago |
zxc
|
7d9da3f938
|
党员统计
|
5 years ago |
|
zxc
|
ccb6c9c9ce
|
党员统计,定时任务
|
5 years ago |
|
zxc
|
ade004c33e
|
党员统计
|
5 years ago |
|
zxc
|
286c0edfdf
|
党员统计
|
5 years ago |
|
zxc
|
2d300f6962
|
党员统计
|
5 years ago |
|
zxc
|
bafcf3b0f0
|
党员统计
|
5 years ago |
jianjun
|
4fff0c0180
|
如果最大值最小值一致 则使用反正切函数计算分数;2:修改计算校验
|
5 years ago |
wxz
|
88fccb65fd
|
去掉错误提交的Feignclient
|
5 years ago |
|
wxz
|
70cba3bff2
|
修改kcscreen白名单
|
5 years ago |
|
wxz
|
2af96ddbc1
|
修改：增加部分接口的分页
修改：调整部分接口的排序
|
5 years ago |
|
zxc
|
42550f5ba1
|
议题附表
|
5 years ago |
|
zxc
|
aecd177bdf
|
议题附表
|
5 years ago |
|
zxc
|
da6830fd62
|
议题附表
|
5 years ago |
|
wxz
|
ea98ab1299
|
版本升级
|
5 years ago |
|
zxc
|
eae7a7ebca
|
议题附表
|
5 years ago |
|
wxz
|
3fb974787f
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
cbae166d00
|
孔村大屏接口开发完成
|
5 years ago |
yinzuomei
|
5a3e7c4cbe
|
话题暂存
|
5 years ago |
|
yinzuomei
|
4c9c5da138
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java
|
5 years ago |
|
yinzuomei
|
8f591e262c
|
话题暂存
|
5 years ago |
|
zxc
|
0146781bfc
|
议题附表
|
5 years ago |
|
jianjun
|
d6e2737342
|
部署report
|
5 years ago |
|
jianjun
|
6a771ce584
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
9063c10aa6
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
86dd1e7afb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
a84eed60c4
|
部署report，stits
|
5 years ago |
|
zxc
|
69d5e200e0
|
议题附表
|
5 years ago |
|
zxc
|
8df3145445
|
三大能力求和四舍五入
|
5 years ago |
|
yinzuomei
|
8d7d55debf
|
话题暂存
|
5 years ago |
|
yinzuomei
|
2373259a21
|
话题暂存
|
5 years ago |
|
jianjun
|
a76724678a
|
部署report，stits
|
5 years ago |
|
jianjun
|
3db9af315b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
zxc
|
b4f7add54c
|
sql补漏
|
5 years ago |
|
jianjun
|
c984214db1
|
部署report，stits
|
5 years ago |
|
jianjun
|
4d5cefa948
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
# epmet-module/data-statistical/data-statistical-server/pom.xml
|
5 years ago |
|
jianjun
|
e487bc7a9c
|
部署report，stits
|
5 years ago |
|
jianjun
|
3afa01dbfa
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
cd217f2030
|
平均值的 不需要 再次归一计算了 只需要乘以权重
|
5 years ago |
|
zxc
|
c42e3b2377
|
小数修改
|
5 years ago |
|
jianjun
|
823c3570f0
|
下级组织/部门指数排行 去掉 部门的数据
|
5 years ago |
|
yinzuomei
|
1afba4bbe6
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
yinzuomei
|
d77bb61d27
|
解决报错
|
5 years ago |
|
zxc
|
72a0ef2529
|
议题主表
|
5 years ago |
sunyuchao
|
3cb4d7e6e0
|
孔村大屏接口自测问题修改
|
5 years ago |
|
jianjun
|
7e096b89d6
|
在部署下
|
5 years ago |
|
jianjun
|
a9b2ae536e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
d2f935e77d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
098c4d0e2e
|
没有总分
|
5 years ago |
