From 67b025d410818833edf7acf55854173cf3577b37 Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Tue, 10 Feb 2026 13:09:32 +0800 Subject: [PATCH] 1 --- .../src/main/java/com/evo/common/utils/ParamUtils.java | 6 ++++++ .../SalaryCalculationStrategyExchangeProcessor.java | 2 +- .../service/impl/RzLeaveDetailServiceImpl.java | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java b/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java index f03c9ca..e74b24b 100644 --- a/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java +++ b/evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java @@ -332,6 +332,12 @@ public class ParamUtils { return Collections.asList(param.getParamValue().split(",")).stream().filter(StringUtils::isNotEmpty).map(Long::valueOf).collect(Collectors.toList()); } + public static List getWebCompany(){ + RzSysParam param= paramService.getRzSysParam("外包公司名称", "web_company","WB,LWWB","外包公司, 不扣个税)"); + return Collections.asList(param.getParamValue().split(",")).stream().filter(StringUtils::isNotEmpty).collect(Collectors.toList()); + } + + /*** * 获取80%假期 * @return diff --git a/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java b/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java index ff5b3af..cf11e9a 100644 --- a/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java +++ b/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java @@ -258,7 +258,7 @@ public interface SalaryCalculationStrategyExchangeProcessor { } //判断是否外包，外包公司员工不做税(月薪50000不上税) - if("WB".equals(sysStaff.getCompanyName())){ + if(ParamUtils.getWebCompany().contains(sysStaff.getCompanyName().toUpperCase())){ // 实发工资 = 税前工资 rzSalaryDetail.setNetPayroll(rzSalaryDetail.getSalaryBeforeTax().subtract(rzSalaryDetail.getMealFee())); // 此阶税率为百分之3，速减数为0 diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java index c13c7aa..df63f39 100644 --- a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java @@ -157,7 +157,9 @@ public class RzLeaveDetailServiceImpl extends ServiceImpl extensionMap = Collections.emptyMap(); //先计算相差几个月 Integer betweenMonth = DateUtils.getBetweenMonth(rzLeaveDetail.getLeaveStartTime(), rzLeaveDetail.getLeaveEndTime()); - if(betweenMonth == 0 && Long.valueOf(1).equals(DateUtils.getBetweenDays(rzLeaveDetail.getLeaveStartTime(),rzLeaveDetail.getLeaveEndTime())+1)){ + //调整下 只要没跨月,写多少就是多少 + //if(betweenMonth == 0 && Long.valueOf(1).equals(DateUtils.getBetweenDays(rzLeaveDetail.getLeaveStartTime(),rzLeaveDetail.getLeaveEndTime())+1)){ + if(betweenMonth == 0){ extensionMap.put("month"+m.format(rzLeaveDetail.getLeaveStartTime()), ym.format(rzLeaveDetail.getLeaveStartTime())); //如果只请1天, 则按照录入的时间计算, 如果 extensionMap.put("hours"+m.format(rzLeaveDetail.getLeaveStartTime()), rzLeaveDetail.getLeaveHour());