wxz
|
dec52fd7e2
|
版本升级
|
4 years ago |
yinzuomei
|
aa54bf2c73
|
组织生活发布：resi-group
|
4 years ago |
|
yinzuomei
|
e1dd0abcf0
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
30c306ba71
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
sunyuchao
|
b8d4d8cb67
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
wxz
|
05222f2c93
|
Merge branch 'wxz_fix_job_repeat' into release_temp
|
4 years ago |
|
sunyuchao
|
e01400bb27
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
wxz
|
a8936cde2f
|
Merge branch 'wxz_fix_job_repeat' into develop
|
4 years ago |
|
sunyuchao
|
879d23adfa
|
Merge branch 'dev_staff_info' into develop
|
4 years ago |
|
wxz
|
3b4c455df9
|
修复：job重复执行
|
4 years ago |
|
sunyuchao
|
a61fd17deb
|
组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除
|
4 years ago |
|
yinzuomei
|
cf66c63e62
|
txl+fsxx：agg、message、user、gov-access、issue、gov-mine、gov-org、resi-party
|
4 years ago |
|
yinzuomei
|
8e651995a8
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
f21f8f2a5e
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
|
sunyuchao
|
a2c2f99b2a
|
评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加，结果值四舍五入保留一位；
三大能力的分=原始值四舍五入保留一位* 权重，结果值四舍五入保留一位；
单项原始值：直接四舍五入保留一位小数；】调整
|
4 years ago |
zxc
|
e7571f0538
|
四舍五入
|
4 years ago |
|
yinzuomei
|
624f39998a
|
month/indexscore接口修改 发布
|
4 years ago |
|
yinzuomei
|
d4e80efb59
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
084be558ed
|
month/indexscore接口修改
|
4 years ago |
|
yinzuomei
|
c20d0e5029
|
/report/fact/index/scorelist接口修改 发布
|
4 years ago |
|
yinzuomei
|
cce2c775b2
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
3dfb39724f
|
/report/fact/index/scorelist接口修改
|
4 years ago |
|
yinzuomei
|
742d452bd6
|
selectMonthPieChart修改 fb
|
4 years ago |
|
yinzuomei
|
4909765bde
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
24c02ab557
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7d2ccc1906
|
selectMonthPieChart修改
|
4 years ago |
|
wxz
|
16541a6cf8
|
版本升级
|
4 years ago |
|
zxc
|
e7e23d0073
|
统计服务升级
|
4 years ago |
|
zxc
|
bbe7e752e8
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
566252e747
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
aefe316a6a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
8d08abc80c
|
screenProjectOrgDaily修改
|
4 years ago |
|
sunyuchao
|
65ab82660d
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
074645cbaf
|
Merge branch 'dev_staff_info' into develop
|
4 years ago |
|
sunyuchao
|
23936ab743
|
组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序
|
4 years ago |
|
sunyuchao
|
8aded069a9
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
b27cf03db1
|
Merge branch 'dev_staff_info' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
# epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
|
4 years ago |
jianjun
|
182dd06c66
|
差值 差值 代码微调
|
4 years ago |
|
jianjun
|
b538a3c5d1
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
a574ef5683
|
差值 差值 代码微调
|
4 years ago |
|
jianjun
|
7e1a228191
|
差值 差值
|
4 years ago |
|
sunyuchao
|
b1c45ef558
|
sql优化
|
4 years ago |
|
jianjun
|
6e41c8f4a9
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
4 years ago |
|
jianjun
|
b06a621c1a
|
。。。
|
4 years ago |
|
jianjun
|
e513dd925e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
59f134ef54
|
。。。
|
4 years ago |
|
jianjun
|
882874e5ad
|
。。。
|
4 years ago |
|
jianjun
|
0528034032
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
65d8cbcd19
|
倒序
|
4 years ago |
|
jianjun
|
9a71700c6c
|
再次修改 上线agg
|
4 years ago |
