|
|
@@ -710,6 +710,7 @@ public class LeaveAllowanceFacadeControllerBean extends AbstractLeaveAllowanceFa
|
|
|
while (rowSet.next()) {
|
|
|
HolidayLimitInfo lastYearHolidayLimitInfo = new HolidayLimitInfo();
|
|
|
lastYearHolidayLimitInfo.setId(BOSUuid.read(rowSet.getString("lastLfID")));
|
|
|
+ //今年结转额度
|
|
|
lastYearHolidayLimitInfo.setBigDecimal("Carryforward", rowSet.getBigDecimal("lastnextForward"));
|
|
|
// 去年 折算标准额度
|
|
|
BigDecimal lastYearConvertedLimit = rowSet.getBigDecimal("lcfconvertedlimit");
|
|
|
@@ -718,6 +719,7 @@ public class LeaveAllowanceFacadeControllerBean extends AbstractLeaveAllowanceFa
|
|
|
// 去年 从去年结转额度
|
|
|
BigDecimal lastYearLastCarryforward = rowSet.getBigDecimal("lCFLastCarryforward");
|
|
|
// 去年 标准额度 = 额度规则（折算额度）+初始化额度+从去年结转-结转到明年
|
|
|
+ //去年 折算标准额度 + 去年 初始化额度 + 去年 从去年结转额度
|
|
|
BigDecimal lastYearStandardLimit = lastYearConvertedLimit.add(lastYearInitializedLimit).add(lastYearLastCarryforward).subtract(lastYearHolidayLimitInfo.getBigDecimal("Carryforward"));
|
|
|
|
|
|
lastYearHolidayLimitInfo.setStandardLimit(lastYearStandardLimit);
|
|
|
@@ -729,6 +731,7 @@ public class LeaveAllowanceFacadeControllerBean extends AbstractLeaveAllowanceFa
|
|
|
|
|
|
HolidayLimitInfo thisYearHolidayLimitInfo = new HolidayLimitInfo();
|
|
|
thisYearHolidayLimitInfo.setId(BOSUuid.read(rowSet.getString("thisLFid")));
|
|
|
+ //上年转入额度
|
|
|
thisYearHolidayLimitInfo.setBigDecimal("LastCarryforward", rowSet.getBigDecimal("thislastforward"));
|
|
|
// 今年 折算标准额度
|
|
|
BigDecimal thisYearConvertedLimit = rowSet.getBigDecimal("tcfconvertedlimit");
|
|
|
@@ -737,8 +740,12 @@ public class LeaveAllowanceFacadeControllerBean extends AbstractLeaveAllowanceFa
|
|
|
// 今年 从去年结转额度 TODO xxx
|
|
|
BigDecimal thisYearCarryforward = rowSet.getBigDecimal("tCFCarryforward");
|
|
|
// 今年 标准额度 = 额度规则（折算额度）+初始化额度+从去年结转-结转到明年
|
|
|
+
|
|
|
+ // 标准额度 =折算标准额度 + 今年初始化额度 + 上年转入额度 - 去年结转额度 ;
|
|
|
BigDecimal thisYearStandardLimit = thisYearConvertedLimit.add(thisYearInitializedLimit).add(thisYearHolidayLimitInfo.getBigDecimal("LastCarryforward")).subtract(thisYearCarryforward);
|
|
|
+
|
|
|
thisYearHolidayLimitInfo.setStandardLimit(thisYearStandardLimit);
|
|
|
+ // 今年标准额度 + 增减额度 14 +0 =14
|
|
|
thisYearHolidayLimitInfo.setRealLimit(thisYearHolidayLimitInfo.getStandardLimit().add(rowSet.getBigDecimal("tFADDORSUBLIMIT")));
|
|
|
thisYearHolidayLimitInfo.setRemainLimit(thisYearHolidayLimitInfo.getRealLimit().subtract(rowSet.getBigDecimal("tFUSEDLIMIT")).subtract(rowSet.getBigDecimal("tFreezeLimit")));
|
|
|
thisYearHolidayLimitInfo.setLastUpdateUser(ContextUtil.getCurrentUserInfo(ctx));
|
yuanzhi_kuang