Merge branch 'pollex-dev' into sit

wayne

2022-02-17 4394e4248455637ab7836756058ac872fdf4af10

 pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java

@@ -36,6 +36,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

import static com.pollex.pam.consts.SeniorityQueryConst.*;
@@ -358,17 +359,18 @@
    }

   public void setConsultantAvgScore(Satisfaction satisfaction) {
      float avgScore = getAgentAvgScore(satisfaction.getAgentNo());
      Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo())
            .get();
      consultant.setAvgScore(avgScore);
      consultantRepository.save(consultant);
      Optional<Float> avgScore = getAgentAvgScore(satisfaction.getAgentNo());

        if(avgScore.isPresent()) {
            BigDecimal bigDecimal = BigDecimal.valueOf(avgScore.get());

            Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo()).get();
            consultant.setAvgScore(bigDecimal.setScale(1, BigDecimal.ROUND_HALF_UP).floatValue());
            consultantRepository.save(consultant);
        }
   }

   public float getAgentAvgScore(String agentNo) {
      Float avgScore = satisfactionRepository.getAgentScoreAvg(agentNo);
      if(avgScore==null)return 0;
      BigDecimal bigDecimal = new BigDecimal(avgScore);
      return avgScore = bigDecimal.setScale(1,BigDecimal.ROUND_HALF_UP).floatValue();
   public Optional<Float> getAgentAvgScore(String agentNo) {
      return satisfactionRepository.getAgentScoreAvg(agentNo);
   }
}