|
@@ -1068,8 +1068,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
boolean b = this.saveOrUpdateBatch(evaluationInfos);
|
|
boolean b = this.saveOrUpdateBatch(evaluationInfos);
|
|
if(b && null !=evaluationInfos && evaluationInfos.size()>0){
|
|
if(b && null !=evaluationInfos && evaluationInfos.size()>0){
|
|
OrganizationEvaluationInfo info = this.getById(scoreid);
|
|
OrganizationEvaluationInfo info = this.getById(scoreid);
|
|
-// List<EvaluationScoreCount> listcount = evaluatioinScoreCountService.getEvaluationScoreCountList(info.getOrganizationEvaluationId(),info.getOrganizationEvaluationRuleId(),info.getIndicatorId(),"");
|
|
|
|
-// if(null != listcount && listcount.size()>0){
|
|
|
|
|
|
+ List<EvaluationScoreCount> listcount = evaluatioinScoreCountService.getEvaluationScoreCountList(info.getOrganizationEvaluationId(),info.getOrganizationEvaluationRuleId(),info.getIndicatorId(),"");
|
|
|
|
+ if(null != listcount && listcount.size()>0){
|
|
// EvaluationScoreCount count = listcount.get(0);
|
|
// EvaluationScoreCount count = listcount.get(0);
|
|
// count.setJfScore(jfScore);
|
|
// count.setJfScore(jfScore);
|
|
// count.setKfScore(kfScore);
|
|
// count.setKfScore(kfScore);
|
|
@@ -1078,9 +1078,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
// count.setScore(score);
|
|
// count.setScore(score);
|
|
// count.setObversionScore(score);
|
|
// count.setObversionScore(score);
|
|
// evaluatioinScoreCountService.saveOrUpdate(count);
|
|
// evaluatioinScoreCountService.saveOrUpdate(count);
|
|
-// }else {
|
|
|
|
|
|
+ }else {
|
|
calculationByEvaluationId("", info.getIndicatorId(),info.getOrganizationEvaluationId(),"");
|
|
calculationByEvaluationId("", info.getIndicatorId(),info.getOrganizationEvaluationId(),"");
|
|
-// }
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|