zxc
|
281b69b4f2
|
全区相关
|
5 years ago |
jianjun
|
b25dfe810e
|
Merge remote-tracking branch 'remotes/origin/dev_externalappauth' into dev_screen_data
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
5 years ago |
|
zxc
|
8d0e923f77
|
getAgencyListByCustomerId方法数据源改回原来的 STATS
|
5 years ago |
zhangyongzhangyong
|
f7282c4f00
|
control代码恢复
|
5 years ago |
|
zhangyongzhangyong
|
6847c957e2
|
配置文件恢复
|
5 years ago |
|
zhangyongzhangyong
|
95d8c395cb
|
Merge branch 'dev_screen_data' of C:\Users\Administrator\Desktop\党群e事通后端 with conflicts.
|
5 years ago |
|
jianjun
|
e073922dc1
|
添加统一的应用启动检查类
|
5 years ago |
|
jianjun
|
e65c6581ed
|
添加统一的应用启动检查类
|
5 years ago |
|
jianjun
|
9fbb8136e4
|
党员相关 如果只有一条记录则给50分；处理导入指标的正负相关及阈值
|
5 years ago |
yinzuomei
|
1427c2cbbc
|
区直部门暂存v1
|
5 years ago |
|
zxc
|
a203a8626d
|
街道相关优化 3
|
5 years ago |
|
zxc
|
1f27decf19
|
街道相关优化 2
|
5 years ago |
|
yinzuomei
|
6b2730e4aa
|
区直部门暂存
|
5 years ago |
|
yinzuomei
|
7a843a47a5
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
2a3bcfde29
|
/data/stats/indexcollect/orggovrnability新增handleProjectRatio
|
5 years ago |
|
zxc
|
e9896edd90
|
街道相关优化 1
|
5 years ago |
|
zxc
|
b2249ac8fd
|
街道相关优化
|
5 years ago |
|
zxc
|
6a37525f24
|
街道相关
|
5 years ago |
|
jianjun
|
3266e3d7d3
|
修改数据库
|
5 years ago |
|
jianjun
|
65995689cf
|
修改数据库
|
5 years ago |
|
jianjun
|
2888963bb0
|
修改数据库
|
5 years ago |
|
jianjun
|
87f7b11197
|
添加flyway文件
|
5 years ago |
|
zxc
|
c9dabcadaf
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
zxc
|
d31e78978c
|
sql文件
|
5 years ago |
wangchao
|
b62b1aefb3
|
大屏数据接口分页修改
|
5 years ago |
|
jianjun
|
7456f6a223
|
添加测试及生产数据库配置文件
|
5 years ago |
wxz
|
d65cc6cea2
|
新增：外部应用秘钥重置
|
5 years ago |
|
jianjun
|
5159201f09
|
添加大屏数据库脚本文件
|
5 years ago |
|
jianjun
|
ec29fcc834
|
添加数据库，包移动
|
5 years ago |
|
jianjun
|
abc777a489
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
f5ffb40bbf
|
错误修改
|
5 years ago |
|
wangchao
|
cbf4295b35
|
mapper修改
|
5 years ago |
|
wangchao
|
87b63b5db8
|
大屏数据接口修改，在没有当月数据时默认查询之前的月份，数据范围：最多向前跨越一年
|
5 years ago |
|
yinzuomei
|
425f9114e9
|
去掉注解
|
5 years ago |
|
yinzuomei
|
2a0330c055
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
|
5 years ago |
|
yinzuomei
|
3dff6f26e7
|
去掉注解
|
5 years ago |
|
jianjun
|
6f1c491aae
|
添加数据源待测，移动包
|
5 years ago |
|
jianjun
|
e70bdf3680
|
添加数据源待测，移动包
|
5 years ago |
|
zxc
|
d18b4b7d68
|
街道相关
|
5 years ago |
|
yinzuomei
|
77683557fb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
17378a8c59
|
indexcal 指标计算，结果； indexcoll指标采集
|
5 years ago |
|
jianjun
|
af9298e087
|
阈值
|
5 years ago |
|
zxc
|
f9b1f60b9b
|
街道相关
|
5 years ago |
|
yinzuomei
|
d2d099c74c
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
09d0e5d94c
|
有阈值，且最大值>阈值，则最大值赋值为阈值；allRegion=》district
|
5 years ago |
|
zxc
|
14142d608d
|
区/街道相关分数表,区直部门分值表相关文件添加
|
5 years ago |
|
wxz
|
0b6ee2a2ee
|
新增：md5摘要验签方式的外部应用认证
|
5 years ago |
|
zxc
|
2b907596aa
|
社区相关优化 7
|
5 years ago |
|
yinzuomei
|
94c928452f
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
667dd0ef25
|
网格相关-只上传一条事实记录，分值默认50
|
5 years ago |
