zhaoqifeng
|
45071ddf18
|
项目超期滞留提醒定时任务
|
5 years ago |
jianjun
|
79cdd1a2b8
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
|
5 years ago |
|
zhaoqifeng
|
40bc5d0320
|
项目超期滞留提醒定时任务
|
5 years ago |
zxc
|
23d4e4a8ca
|
项目详情
|
5 years ago |
|
jianjun
|
f4e4299520
|
删除错误包
|
5 years ago |
|
jianjun
|
bc9a7faa60
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
wangchao
|
62093f1bc7
|
feign注解
|
5 years ago |
|
jianjun
|
c13fcd5484
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
|
jianjun
|
4bcfff380f
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
5 years ago |
|
wangchao
|
921c52a10b
|
因为项目业务改造而需要将历史数据补充到新表的逻辑，从data-stats移动到gov-project下
|
5 years ago |
|
zxc
|
ed2739ae60
|
项目详情
|
5 years ago |
|
zxc
|
3007f286f1
|
项目详情
|
5 years ago |
|
jianjun
|
b943131d11
|
本级及下级 乘以权重
|
5 years ago |
|
zxc
|
a5915b1196
|
项目详情
|
5 years ago |
|
zxc
|
328a76a173
|
项目详情
|
5 years ago |
|
jianjun
|
ce6613c174
|
数据中乘以权重
|
5 years ago |
|
wangchao
|
0cc882cc5b
|
项目改造
|
5 years ago |
|
jianjun
|
f0ce88c099
|
区划限制显示
|
5 years ago |
|
jianjun
|
a97838a1d3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
c80561d30a
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
4564033dac
|
项目详情
|
5 years ago |
|
jianjun
|
2a3eb25d1f
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
27dbc20c8a
|
项目详情
|
5 years ago |
|
jianjun
|
fd5796353e
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zxc
|
79c8e0fa32
|
项目详情
|
5 years ago |
|
zhaoqifeng
|
aa33c94803
|
项目超期滞留提醒
|
5 years ago |
|
jianjun
|
ec18ded05c
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zhaoqifeng
|
5a8237f007
|
项目超期滞留提醒
|
5 years ago |
|
jianjun
|
2091c4a771
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zxc
|
2fccb11d76
|
backDoor修改
|
5 years ago |
|
zxc
|
970757119c
|
项目详情
|
5 years ago |
|
jianjun
|
fd678eddb7
|
微调后门外部调用方法
|
5 years ago |
|
jianjun
|
a94a22dc48
|
微调后门外部调用方法
|
5 years ago |
|
zxc
|
40b8c2a77f
|
项目详情
|
5 years ago |
|
zxc
|
986cdedb30
|
项目详情
|
5 years ago |
|
zxc
|
8be82b9346
|
项目详情
|
5 years ago |
|
zxc
|
1538f9af90
|
组织区域查询【智慧社区】
|
5 years ago |
|
jianjun
|
2d24040193
|
计算器调整
|
5 years ago |
|
zxc
|
c1ba822d24
|
指标分数修改
|
5 years ago |
|
jianjun
|
8c26411a6c
|
修改变量
|
5 years ago |
|
zxc
|
b9bf1d8a00
|
backDoor
|
5 years ago |
|
zxc
|
9a744f6625
|
backDoor
|
5 years ago |
|
zxc
|
0005d92fb0
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
zxc
|
3ba5cc7a95
|
backDoor
|
5 years ago |
|
zhaoqifeng
|
a34d7ad044
|
项目数据抽取修改
|
5 years ago |
|
zxc
|
f9e0390959
|
backDoor
|
5 years ago |
|
zhaoqifeng
|
b9f3d3d8c6
|
项目超期滞留提醒
|
5 years ago |
|
jianjun
|
da79a716d3
|
下级组织单项指数得分排行接口
|
5 years ago |
wxz
|
403fa91e79
|
Merge branch 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
Conflicts:
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
|
5 years ago |
|
wxz
|
ed091e9906
|
新增：根据appId生成jwt AccessToken的FeignCLient
|
5 years ago |
