jianjun
|
4935232bbc
|
Merge remote-tracking branches 'remotes/origin/dev_common' and 'remotes/origin/dev_screen_data_2.0' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
6 years ago |
|
jianjun
|
53a3c14e4a
|
引入redisson分布式锁
|
6 years ago |
|
jianjun
|
b70ef58633
|
添加下级及自身分数 数据
|
6 years ago |
yinzuomei
|
0ed9c2921f
|
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/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
|
6 years ago |
|
yinzuomei
|
b1de6d36b4
|
先进模范数据抽取到大屏表screen_pioneer_dataV0.3
|
6 years ago |
wangchao
|
dd90609bec
|
project_main添加isResolved状态
|
6 years ago |
|
wangchao
|
e3898bc5a6
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
6 years ago |
|
wangchao
|
46de4fa739
|
projetc_log、group_member添加pids,分别表示不同的涵义
|
6 years ago |
sunyuchao
|
eeb2791675
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
6 years ago |
|
jianjun
|
7dde2c65c9
|
获取下级部门的数据 添加月份条件，并返回组织类型
|
6 years ago |
|
sunyuchao
|
4f278d6bb0
|
能力指标数据接口
|
6 years ago |
zxc
|
243f9e8ef5
|
议题抽取状态更新添加
|
6 years ago |
|
jianjun
|
5857c6cb58
|
组织自身和下级分数
|
6 years ago |
|
zxc
|
6ab0dbd049
|
党员数据抽取
|
6 years ago |
|
sunyuchao
|
8664d1cd65
|
数据接口 保留一位小数
|
6 years ago |
|
sunyuchao
|
105669cf8d
|
Merge branch 'dev_screen_data' into dev_screen_data_2.0
|
6 years ago |
|
sunyuchao
|
0d739010ac
|
自己系统缺少的部分数据查询接口
|
6 years ago |
wxz
|
9ced7bf3fd
|
Merge branch 'dev_externalappauth' into dev_screen_data_2.0
|
6 years ago |
|
wxz
|
f63d437461
|
内部应用注解认证修改
|
6 years ago |
|
wxz
|
5c6929a51c
|
Merge remote-tracking branch 'origin/dev' into dev_externalappauth
# Conflicts:
# epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
6 years ago |
|
wxz
|
2b988de560
|
增加内部应用认证注解
|
6 years ago |
|
zxc
|
2e6b6b0ee1
|
党员数据抽取添加pids
|
6 years ago |
|
zxc
|
4a6a227393
|
党员大屏数据抽取
|
6 years ago |
|
zxc
|
676c76c9ff
|
党员大屏数据抽取
|
6 years ago |
|
jianjun
|
24536ebcf8
|
代码修复
|
6 years ago |
|
zxc
|
3426d3bf6d
|
党员大屏数据抽取
|
6 years ago |
|
jianjun
|
5a1c555f5b
|
捕获跟组织数据异常
|
6 years ago |
|
yinzuomei
|
fb65e8c09b
|
话题原始数据抽取添加pids
|
6 years ago |
|
wangchao
|
19313bb233
|
办结效率、办结率做响应调整，调整部分方法名称
|
6 years ago |
|
jianjun
|
1e69f39dfd
|
Merge branches 'dev' and 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
|
6 years ago |
|
jianjun
|
f780bff48d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
6 years ago |
|
jianjun
|
edd0de7fab
|
指标自身和下级代码暂存
|
6 years ago |
|
wxz
|
7dc7613e61
|
版本升级
|
6 years ago |
|
wxz
|
90041578e5
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
6 years ago |
|
wxz
|
dc26486624
|
Merge branch 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
|
6 years ago |
|
wxz
|
5b5033f6d5
|
job服务增加大屏的agency,grid,dept维度初始化
|
6 years ago |
|
yinzuomei
|
025ef42093
|
先进模范数据抽取到大屏表screen_pioneer_dataV0.2
|
6 years ago |
|
wxz
|
9980ea0a91
|
修改controller方法的名称
|
6 years ago |
|
jianjun
|
89e72d6fde
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
6 years ago |
|
jianjun
|
84b06adb5e
|
指标添加 所有指标路径
|
6 years ago |
|
wxz
|
fece3d5ba7
|
版本升级
|
6 years ago |
|
wxz
|
0df3674fc2
|
修改错误
|
6 years ago |
|
wxz
|
31a348737c
|
Merge branch 'dev_screen_data_2.0' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
|
6 years ago |
|
wxz
|
282acc9b13
|
增加index维度初始化的feignclient调用接口
|
6 years ago |
|
wxz
|
9eed0be534
|
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/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
|
6 years ago |
|
wxz
|
56e386fe3f
|
新增：index库的screen_customer_agency,screen_customer_dept,screen_customer_grid的初始化
|
6 years ago |
|
yinzuomei
|
158bc192d1
|
先进模范数据抽取到大屏表screen_pioneer_dataV0.1
|
6 years ago |
|
zxc
|
78f00d6728
|
内测 获取所有下级AgencyId
|
6 years ago |
|
zxc
|
4f8b998771
|
内测 获取所有下级AgencyId
|
6 years ago |
|
jianjun
|
ba29923de8
|
恢复日志
|
6 years ago |
