zm
/
weaver-zhuyou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

年休假修复

This commit is contained in:
zhangming 2025-05-27 17:36:02 +08:00
parent 7a506ae8af
commit 67fb396a14
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/kq/biz/KQBalanceOfLeaveBiz.java
View File

@ -326,7 +326,7 @@ public class KQBalanceOfLeaveBiz {
} }
if (StringUtils.equals(annualRuleId, ruleId)) { if (StringUtils.equals(annualRuleId, ruleId)) {
if (monthOfYear.compareTo(new BigDecimal("7")) < 0) { 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 { } else {
return baseAmount; return baseAmount;
} }

7
src/weaver/interfaces/zhuyou/cronjob/AnnualLeaveCarryOverJob.java
View File

@ -1,6 +1,5 @@
package weaver.interfaces.zhuyou.cronjob; package weaver.interfaces.zhuyou.cronjob;
import com.engine.kq.biz.KQBalanceOfLeaveBiz;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet; import weaver.conn.RecordSet;
import weaver.general.BaseBean; import weaver.general.BaseBean;
@ -11,8 +10,6 @@ import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
/** /**
* @version 1.0 * @version 1.0
@ -82,7 +79,7 @@ public class AnnualLeaveCarryOverJob extends BaseCronJob {
continue; 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); BigDecimal resBase = baseAmount.subtract(oldBase);
@ -137,7 +134,7 @@ public class AnnualLeaveCarryOverJob extends BaseCronJob {
continue; 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); BigDecimal resBase = baseAmount.subtract(oldBase);