|
|
@@ -863,10 +863,16 @@ public class AnnualAdjustmentService {
|
|
|
if(ac.data.getRankingResultInfo() != null) {
|
|
|
newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANK, ac.data.getRankingResultInfo().topRank);
|
|
|
newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANK, ac.data.getRankingResultInfo().allowanceRank);
|
|
|
- newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANKPERCENT, new BigDecimal(ac.data.getRankingResultInfo().topRankPercent.toString()));
|
|
|
+ BigDecimal topRankPercent = Optional.ofNullable(ac.data.getRankingResultInfo().topRankPercent)
|
|
|
+ .map(BigDecimal::new)
|
|
|
+ .orElse(BigDecimal.ZERO);
|
|
|
+ newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANKPERCENT, topRankPercent);
|
|
|
newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKMARK, ac.data.getRankingResultInfo().allowanceRankMark);
|
|
|
newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKSEL, ac.data.getRankingResultInfo().allowanceRankSel);
|
|
|
- newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKPCT, new BigDecimal(ac.data.getRankingResultInfo().allowanceRankPercent.toString()));
|
|
|
+ BigDecimal allowanceRankPercent = Optional.ofNullable(ac.data.getRankingResultInfo().allowanceRankPercent)
|
|
|
+ .map(BigDecimal::new)
|
|
|
+ .orElse(BigDecimal.ZERO);
|
|
|
+ newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKPCT, allowanceRankPercent);
|
|
|
}
|
|
|
//上年度考核结果
|
|
|
newPersonPosFile.set(PositionStructureConstant.NCKD_APPRAISALRESULT, ac.data.getAppraisalResult());
|