Commit 3de58896 authored by zhuxiang's avatar zhuxiang
Browse files

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

parent 84f466dc
...@@ -56,9 +56,19 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re ...@@ -56,9 +56,19 @@ 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);
if(StringUtils.isNotEmpty(total)){
String totalStr = total.getString("v"); String totalStr = total.getString("v");
if (StringUtils.isNotEmpty(totalStr) && totalStr.contains("合计:")) { if (StringUtils.isNotEmpty(totalStr) && totalStr.contains("合计:")) {
//普通员工绩效
JSONObject score = row.getJSONObject(11); JSONObject score = row.getJSONObject(11);
if(StringUtils.isNull(score)){
//部门管理员绩效
score = row.getJSONObject(10);
}
//财务绩效
if(StringUtils.isNull(score)){
score = row.getJSONObject(4);
}
totalScore = score.getString("v"); totalScore = score.getString("v");
if (StringUtils.isEmpty(totalScore)) { if (StringUtils.isEmpty(totalScore)) {
JSONObject scoreSj = row.getJSONObject(9); JSONObject scoreSj = row.getJSONObject(9);
...@@ -67,6 +77,7 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re ...@@ -67,6 +77,7 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
break; break;
} }
} }
}
if (!totalScore.equals("0")) { if (!totalScore.equals("0")) {
//更新用户绩效分 //更新用户绩效分
UserPerformanceEntity userPerformanceEntity = new UserPerformanceEntity(); UserPerformanceEntity userPerformanceEntity = new UserPerformanceEntity();
......
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