yinzuomei
|
ddbd1d1421
|
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/FactOriginGroupMainDailyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
|
5 years ago |
|
yinzuomei
|
d92ba7db0b
|
党员相关-党建能力计算V0.3
|
5 years ago |
zhaoqifeng
|
29eac44df5
|
治理能力统计
|
5 years ago |
jianjun
|
37b4b4c6bb
|
统一抽取添加定时任务
|
5 years ago |
|
jianjun
|
201b82ba87
|
统一抽取 添加小组数据
|
5 years ago |
wangchao
|
a702adc62c
|
小组数据抽取
|
5 years ago |
zxc
|
0006311ce2
|
网格相关 党建能力
|
5 years ago |
|
zxc
|
e5a4f0149e
|
网格相关 党建能力
|
5 years ago |
|
zxc
|
12a7b95ea5
|
网格相关 治理能力
|
5 years ago |
|
zhaoqifeng
|
1e0daa70fc
|
治理能力统计
|
5 years ago |
|
wangchao
|
7dcc09f0b8
|
project-period数据抽取修改
|
5 years ago |
|
jianjun
|
0890247fff
|
统一抽取
|
5 years ago |
|
zxc
|
e5bd914b38
|
补漏
|
5 years ago |
|
zxc
|
41cd752143
|
网格 治理能力 相关
|
5 years ago |
|
jianjun
|
a955342235
|
业务数据统计抽取
|
5 years ago |
|
yinzuomei
|
865febd9a5
|
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/service/evaluationindex/extract/IssueExtractService.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
|
5 years ago |
|
yinzuomei
|
9334e4a42c
|
党员相关-党建能力计算V0.2
|
5 years ago |
|
wangchao
|
c2d90cd420
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
wangchao
|
ef098bf94c
|
project-period
|
5 years ago |
|
jianjun
|
719496aa48
|
部署report
|
5 years ago |
|
jianjun
|
163604cec9
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
12e721b9fe
|
修改错误
|
5 years ago |
|
zxc
|
2422ea3549
|
网格 治理能力 相关
|
5 years ago |
sunyuchao
|
8f8809c357
|
开启PC端登陆验证码校验、third库code_ext表添加主键 服务升级
|
5 years ago |
|
sunyuchao
|
0ae61a4cdd
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
sunyuchao
|
274221b45d
|
开启PC端登陆验证码校验、third库code_ext表添加主键
|
5 years ago |
|
jianjun
|
5bcafa340d
|
部署report
|
5 years ago |
|
jianjun
|
e52fb15909
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
846bd0469d
|
添加日志
|
5 years ago |
|
wangchao
|
59b2af42b3
|
dev_temp project + 1 -> 50
|
5 years ago |
|
jianjun
|
f452756635
|
部署report
|
5 years ago |
|
jianjun
|
3e06f45dee
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
|
5 years ago |
|
jianjun
|
ceca855441
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_screen_data
|
5 years ago |
|
jianjun
|
2ee27b352a
|
添加查询库户下网格指标排行接口
|
5 years ago |
|
zhaoqifeng
|
4ab1ac2053
|
治理能力统计
|
5 years ago |
|
yinzuomei
|
51dcb680ed
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
yinzuomei
|
fe4288e7f3
|
党员相关-党建能力计算V0.1
|
5 years ago |
|
wangchao
|
d545722da0
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
sunyuchao
|
043853cb89
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
928b3290f6
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
wxz
|
9c57792f98
|
将app.jar改成gov-project.jar
|
5 years ago |
|
zhaoqifeng
|
950341a96a
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
zhaoqifeng
|
ed8018a07c
|
项目统计
|
5 years ago |
|
jianjun
|
defcc9bdec
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
3d7ab3ddc8
|
抽取定时任务暂存
|
5 years ago |
|
zxc
|
a55cc4cabd
|
网格相关
|
5 years ago |
|
wangchao
|
68f66ce42d
|
project-period
|
5 years ago |
|
jianjun
|
c06ee65d63
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_screen_data_2.0
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
|
5 years ago |
|
wangchao
|
1898a36952
|
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/project/ProjectProcessDao.java
|
5 years ago |
|
zxc
|
4921fb025b
|
党员统计
|
5 years ago |
