Commit 1e8a72c6 authored by wujipeng's avatar wujipeng
Browse files

Merge branch 'sxx' of https://gitlab.ruzhoukj.com/wujipeng/ops into sxx

parents 8e6890cc deb32278
...@@ -84,10 +84,20 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re ...@@ -84,10 +84,20 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
score = row.getJSONObject(10); score = row.getJSONObject(10);
if (StringUtils.isNotNull(score) && score.getString("v") != null) { if (StringUtils.isNotNull(score) && score.getString("v") != null) {
totalScore = score.getString("v"); totalScore = score.getString("v");
}else{ } else if (reportDataInfoEntity.getUserId().equals("1829057630693335044")) {
//财务绩效 //财务绩效
score = row.getJSONObject(4); score = row.getJSONObject(4);
totalScore = score.getString("v"); totalScore = score.getString("v");
}else if (reportDataInfoEntity.getUserId().equals("1829057630693335045")) {
//张萌
score = row.getJSONObject(8);
totalScore = score.getString("v");
}
else if (reportDataInfoEntity.getUserId().equals("1829057630693335043")
||reportDataInfoEntity.getUserId().equals("1942780351184125954")) {
//人事部
score = row.getJSONObject(9);
totalScore = score.getString("v");
} }
} }
if (StringUtils.isEmpty(totalScore)) { if (StringUtils.isEmpty(totalScore)) {
...@@ -287,10 +297,19 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re ...@@ -287,10 +297,19 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
score = row.getJSONObject(10); score = row.getJSONObject(10);
if (StringUtils.isNotNull(score) && score.getString("v") != null) { if (StringUtils.isNotNull(score) && score.getString("v") != null) {
totalScore = score.getString("v"); totalScore = score.getString("v");
}else{ } else if (reportDataInfoEntity.getUserId().equals("1829057630693335044")) {
//财务绩效 //财务绩效
score = row.getJSONObject(4); score = row.getJSONObject(4);
totalScore = score.getString("v"); totalScore = score.getString("v");
}else if (reportDataInfoEntity.getUserId().equals("1829057630693335045")) {
//张萌
score = row.getJSONObject(8);
totalScore = score.getString("v");
}else if (reportDataInfoEntity.getUserId().equals("1829057630693335043")
||reportDataInfoEntity.getUserId().equals("1942780351184125954")) {
//人事部
score = row.getJSONObject(9);
totalScore = score.getString("v");
} }
} }
if (StringUtils.isEmpty(totalScore)) { if (StringUtils.isEmpty(totalScore)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment