sunyuchao
|
b7a61b772d
|
Merge branch 'dev'
|
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 |
|
zhaoqifeng
|
02adfc0e8b
|
Ext_Json修改
|
5 years ago |
|
zxc
|
c348fcb11a
|
stats服务
|
5 years ago |
|
zxc
|
c0da3704fd
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
47e4308665
|
党员统计
|
5 years ago |
|
jianjun
|
41ccf23db9
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
jianjun
|
a182d771e2
|
部署stits
|
5 years ago |
|
jianjun
|
5ea0bb4317
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
zxc
|
3153e1eb9f
|
stats服务
|
5 years ago |
|
zhaoqifeng
|
b230c483e3
|
项目统计
|
5 years ago |
|
zxc
|
f217e78007
|
stats服务，job服务升级
|
5 years ago |
|
zxc
|
6ce5e6bf8a
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
3a16d4390c
|
党员统计
|
5 years ago |
|
zxc
|
3e40a81a80
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
# 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
|
f341c0f3e7
|
project +1 -> 49
|
5 years ago |
|
wangchao
|
809244a1e2
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
fa34bb2f47
|
更新时间一并置空
|
5 years ago |
|
wangchao
|
5dcba91dab
|
项目退回时，防止将被退回的项目相关人员节点的创建时间赋值给新增的相关人员节点的创建时间，否则数据统计将出现误差
|
5 years ago |
|
wangchao
|
3054940803
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
1c688d7b43
|
项目历时统计相关
|
5 years ago |
|
zxc
|
7d9da3f938
|
党员统计
|
5 years ago |
|
zxc
|
ccb6c9c9ce
|
党员统计,定时任务
|
5 years ago |
|
zxc
|
ade004c33e
|
党员统计
|
5 years ago |
|
zxc
|
286c0edfdf
|
党员统计
|
5 years ago |
|
zxc
|
2d300f6962
|
党员统计
|
5 years ago |
|
jianjun
|
87fa379c57
|
部署stits
|
5 years ago |
|
jianjun
|
da406ec1e1
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
bafcf3b0f0
|
党员统计
|
5 years ago |
|
jianjun
|
4fff0c0180
|
如果最大值最小值一致 则使用反正切函数计算分数;2:修改计算校验
|
5 years ago |
|
wxz
|
88fccb65fd
|
去掉错误提交的Feignclient
|
5 years ago |
|
jianjun
|
e9c18d99e1
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
bb565e0df3
|
xiufu
|
5 years ago |
|
jianjun
|
c2e14f5681
|
部署report
|
5 years ago |
|
wxz
|
7b4e338460
|
xiufu
|
5 years ago |
|
wxz
|
aea3788c8c
|
版本升级
|
5 years ago |
