"src/main/java/com/git@gitlab.ruzhoukj.com:wujipeng/ops.git" did not exist on "84b0b23fe2cccbf244a16272a3572dea57fed6eb"
Commit 3de58896 authored by zhuxiang's avatar zhuxiang
Browse files

优化部门管理员、财务绩效分数获取

parent 84f466dc
...@@ -56,15 +56,26 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re ...@@ -56,15 +56,26 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
for (int i = 5; i < data.size(); i++) { for (int i = 5; i < data.size(); i++) {
JSONArray row = data.getJSONArray(i); JSONArray row = data.getJSONArray(i);
JSONObject total = row.getJSONObject(0); JSONObject total = row.getJSONObject(0);
String totalStr = total.getString("v"); if(StringUtils.isNotEmpty(total)){
if (StringUtils.isNotEmpty(totalStr) && totalStr.contains("合计:")) { String totalStr = total.getString("v");
JSONObject score = row.getJSONObject(11); if (StringUtils.isNotEmpty(totalStr) && totalStr.contains("合计:")) {
totalScore = score.getString("v"); //普通员工绩效
if (StringUtils.isEmpty(totalScore)) { JSONObject score = row.getJSONObject(11);
JSONObject scoreSj = row.getJSONObject(9); if(StringUtils.isNull(score)){
totalScore = scoreSj.getString("m"); //部门管理员绩效
score = row.getJSONObject(10);
}
//财务绩效
if(StringUtils.isNull(score)){
score = row.getJSONObject(4);
}
totalScore = score.getString("v");
if (StringUtils.isEmpty(totalScore)) {
JSONObject scoreSj = row.getJSONObject(9);
totalScore = scoreSj.getString("m");
}
break;
} }
break;
} }
} }
if (!totalScore.equals("0")) { if (!totalScore.equals("0")) {
......
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