qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

联特 税款所属期下下月

This commit is contained in:
Harryxzy 2025-04-17 15:48:09 +08:00
parent c2fde2b3e4
commit 2e9971c998
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java
View File

@ -92,6 +92,11 @@ public class SalarySobBO {
: SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号")
.replace("{0}", "" + salaryCycleFromDay)
.replace("{1}", "" + (salaryCycleFromDay - 1));
case AFTER_NEXT_MONTH:
salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98398, "下下月1号——下下月最后一天")
: SalaryI18nUtil.getI18nLabel(98402, "下下月{0}号——下下下月{1}号")
.replace("{0}", "" + salaryCycleFromDay)
.replace("{1}", "" + (salaryCycleFromDay - 1));
break;
default:
salaryCycleStr = "";

3
src/com/engine/salary/entity/salarysob/bo/SalarySobCycleBO.java
View File

@ -74,6 +74,9 @@ public class SalarySobCycleBO {
if (Objects.equals(cycleType, SalaryCycleTypeEnum.NEXT_MONTH.getValue())) {
return salaryMonth.plus(Period.ofMonths(1));
}
if (Objects.equals(cycleType, SalaryCycleTypeEnum.AFTER_NEXT_MONTH.getValue())) {
return salaryMonth.plus(Period.ofMonths(2));
}
return YearMonth.parse("2000-01");
}

3
src/com/engine/salary/enums/SalaryCycleTypeEnum.java
View File

@ -16,7 +16,8 @@ public enum SalaryCycleTypeEnum implements BaseEnum<Integer> {
BEFORE_LAST_MONTH(1, "上上月", 86075),
LAST_MONTH(2, "上月", 86074),
THIS_MONTH(3, "本月", 86072),
NEXT_MONTH(4, "下月", 86073);
NEXT_MONTH(4, "下月", 86073),
AFTER_NEXT_MONTH(5, "下下月", 0);
private int value;

2
src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
View File

@ -490,6 +490,8 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
salaryCycle = SalaryDateUtil.plusMonths(taxCycle, 1);
} else if (salaryCycleTypeEnum == SalaryCycleTypeEnum.NEXT_MONTH) {
salaryCycle = SalaryDateUtil.plusMonths(taxCycle, -1);
} else if (salaryCycleTypeEnum == SalaryCycleTypeEnum.AFTER_NEXT_MONTH) {
salaryCycle = SalaryDateUtil.plusMonths(taxCycle, -2);
} else {
salaryCycle = taxCycle;
}

6
src/com/engine/salary/transmethod/TransMethod.java
View File

@ -132,6 +132,12 @@ public class TransMethod {
.replace("{0}", "" + salaryCycleFromDay)
.replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
break;
case AFTER_NEXT_MONTH:
salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98398, "下下月1号——下下月最后一天")
: SalaryI18nUtil.getI18nLabel(98402, "下下月{0}号——下下下月{1}号")
.replace("{0}", "" + salaryCycleFromDay)
.replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
break;
default:
salaryCycleStr = "";
}