jianjun
|
78aae336c8
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
ed696007e1
|
添加日志排除问题
|
5 years ago |
wxz
|
eb4f6ba113
|
版本升级
|
5 years ago |
|
wxz
|
6f26160b4a
|
修改配置错误
|
5 years ago |
|
wxz
|
ac0e8f9f71
|
版本升级
|
5 years ago |
|
wxz
|
a7513775d5
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
8ca4536eb0
|
Merge branch 'dev_externalappauth' into dev
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
90d57c7bbf
|
版本升级
|
5 years ago |
|
wxz
|
f394c641ce
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
02218b6856
|
Merge branch 'dev_screen_data_an_2.0' into dev
|
5 years ago |
|
wxz
|
19929b8a6d
|
Merge branch 'dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
bf214698a6
|
反正切函数 兼容正负相关
|
5 years ago |
wangchao
|
636548a2a5
|
data-stats +1 对应的修改：办结率 = 办结数/评价周期内被吹哨次数
|
5 years ago |
|
wangchao
|
f4b78ee2bb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
sunyuchao
|
f6a3bedbf6
|
同级对比接口月度ID非必填
|
5 years ago |
|
sunyuchao
|
76fcea01cc
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
sunyuchao
|
cb27a26417
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
bdcef0a36b
|
人均议题改为小数
|
5 years ago |
|
sunyuchao
|
666e422ef0
|
同级对比接口月度ID非必填
|
5 years ago |
|
jianjun
|
454e529b22
|
人均议题
|
5 years ago |
|
wangchao
|
aa40040837
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
9bedbae99a
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
wxz
|
c604ae6da2
|
版本升级
|
5 years ago |
|
wangchao
|
29c55b8320
|
办结率 = 评价周期内办结项目数/评价周期内被吹哨次数
|
5 years ago |
|
sunyuchao
|
95f6d67df1
|
入参校验
|
5 years ago |
|
sunyuchao
|
48f8e82d36
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
e906eb6a0d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev_temp
|
5 years ago |
|
sunyuchao
|
67a3f8d56d
|
入参校验
|
5 years ago |
|
jianjun
|
53c92c7c14
|
部署statis
|
5 years ago |
|
jianjun
|
79a0f4cf7c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
e97e12adf8
|
反正切函数 区间值
|
5 years ago |
|
wxz
|
c3dea0d232
|
版本升级
|
5 years ago |
|
sunyuchao
|
4176bda91e
|
服务升级
|
5 years ago |
|
sunyuchao
|
2d9cfe85a6
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
sunyuchao
|
2994e3c05f
|
同级对比接口数据按月查询
|
5 years ago |
|
wxz
|
87403b59e9
|
Merge branch 'dev'
|
5 years ago |
|
jianjun
|
df4b6f1b75
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_screen_data_an_2.0
|
5 years ago |
|
wxz
|
67376491d0
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
6dc69d00e4
|
Merge branch 'dev_plugins' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
# epmet-gateway/pom.xml
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-mine/resi-mine-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
zxc
|
f76805e8ba
|
statis服务升级
|
5 years ago |
|
zxc
|
fedfed99b3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
5958b1f138
|
归一数值调整为 60 - 100
|
5 years ago |
|
wxz
|
32359e9f7a
|
升级ext服务的外部应用请求鉴权，使用gateway统一鉴权
|
5 years ago |
|
wxz
|
63d8c0aa2f
|
增加epmet-ext的开放url
|
5 years ago |
|
jianjun
|
5a29d60eda
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_screen_data_an_2.0
|
5 years ago |
|
jianjun
|
b194abb708
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
81abe2e40e
|
合并错误修改
|
5 years ago |
|
jianjun
|
b1428bacb0
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev
|
5 years ago |
|
jianjun
|
9fbbae502e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml
|
5 years ago |
|
wangchao
|
a8f7e88155
|
data-stats 165
|
5 years ago |
