diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCompareServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCompareServiceImpl.java index b3d2ecc..7f3c7f8 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCompareServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCompareServiceImpl.java @@ -107,6 +107,15 @@ public class SubCompareServiceImpl implements SubCompareService{ bean.setEvaId(evaId); String uuid = IdUtils.simpleUUID(); bean.setUuid(uuid); + int avgScore =0; + if(StringUtils.isNotEmpty(bean.getPersonNameList())){ + for (int i = 0; i < bean.getPersonNameList().size(); i++) { + for (int j = 0; j < bean.getPersonNameList().get(i).getPersonScoreList().size(); j++){ + avgScore = avgScore + Integer.parseInt (bean.getPersonNameList().get(i).getPersonScoreList().get(j).getEvaScore()) ; + } + } + } + bean.setAvgScore(avgScore+".00"); int person = dao.updateComparesonInfo(bean); //字表数据进行保存 //保存字表信息 diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubYearEvaluate/SubYearEvaluateList.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubYearEvaluate/SubYearEvaluateList.js index 427c1bf..2672390 100644 --- a/modules/bmw/src/main/resources/static/js/work/SettingManage/SubYearEvaluate/SubYearEvaluateList.js +++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/SubYearEvaluate/SubYearEvaluateList.js @@ -282,7 +282,7 @@ function isEvaluate(value,id , proName,benchmarkScore,subName,contractName,evaMo if(value == upDown){ add(id, proName, subName, contractName, evaMonth, evaYear); }else { - layer.msg("非本年度数据,无法评价,请到相应年度对核心人员进行评价" ,{time:3000}); + layer.msg("当前数据是本年"+ value +"度数据,无法评价" ,{time:3000}); } }else { layer.msg("非本年度数据,无法评价,请到相应年度对核心人员进行评价" ,{time:7000});