diff --git a/src/com/engine/kq/biz/KQBalanceOfLeaveBiz.java b/src/com/engine/kq/biz/KQBalanceOfLeaveBiz.java index 96848f1..5d06238 100644 --- a/src/com/engine/kq/biz/KQBalanceOfLeaveBiz.java +++ b/src/com/engine/kq/biz/KQBalanceOfLeaveBiz.java @@ -326,7 +326,7 @@ public class KQBalanceOfLeaveBiz { } if (StringUtils.equals(annualRuleId, ruleId)) { if (monthOfYear.compareTo(new BigDecimal("7")) < 0) { - return baseAmount.divide(new BigDecimal("2"), RoundingMode.HALF_UP); + return baseAmount.divide(new BigDecimal("2"), 0, RoundingMode.UP); } else { return baseAmount; } diff --git a/src/weaver/interfaces/zhuyou/cronjob/AnnualLeaveCarryOverJob.java b/src/weaver/interfaces/zhuyou/cronjob/AnnualLeaveCarryOverJob.java index 71edeca..f83bfb7 100644 --- a/src/weaver/interfaces/zhuyou/cronjob/AnnualLeaveCarryOverJob.java +++ b/src/weaver/interfaces/zhuyou/cronjob/AnnualLeaveCarryOverJob.java @@ -1,6 +1,5 @@ package weaver.interfaces.zhuyou.cronjob; -import com.engine.kq.biz.KQBalanceOfLeaveBiz; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; @@ -11,8 +10,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.Map; /** * @version 1.0 @@ -82,7 +79,7 @@ public class AnnualLeaveCarryOverJob extends BaseCronJob { continue; } // 上半年释放 - BigDecimal oldBase = baseAmount.divide(new BigDecimal("2"), RoundingMode.HALF_UP); + BigDecimal oldBase = baseAmount.divide(new BigDecimal("2"), 0, RoundingMode.UP); // 剩余释放 BigDecimal resBase = baseAmount.subtract(oldBase); @@ -137,7 +134,7 @@ public class AnnualLeaveCarryOverJob extends BaseCronJob { continue; } // 上半年释放 - BigDecimal oldBase = baseAmount.divide(new BigDecimal("2"), RoundingMode.HALF_UP); + BigDecimal oldBase = baseAmount.divide(new BigDecimal("2"), 0, RoundingMode.UP); // 剩余释放 BigDecimal resBase = baseAmount.subtract(oldBase);