hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
andy 2025-06-05 10:43:07 +08:00
parent 13b0c28817
commit 595d0f4896
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java
View File

@ -2,24 +2,18 @@ package com.evo.finance.processor;
import com.evo.attendance.domain.RzAttendanceStatistical; import com.evo.attendance.domain.RzAttendanceStatistical;
import com.evo.common.constant.Constants; import com.evo.common.constant.Constants;
import com.evo.common.core.domain.AjaxResult; import com.evo.common.utils.DataUtils;
import com.evo.common.utils.*; import com.evo.common.utils.DateUtils;
import com.evo.common.utils.StringUtils;
import com.evo.common.utils.spring.SpringUtils; import com.evo.common.utils.spring.SpringUtils;
import com.evo.finance.domain.RzSalaryDetail; import com.evo.finance.domain.RzSalaryDetail;
import com.evo.finance.mapper.RzSalaryDetailMapper; import com.evo.finance.mapper.RzSalaryDetailMapper;
import com.evo.personnelMatters.domain.RzSubsidy;
import com.evo.personnelMatters.domain.RzSubsidyInfo;
import com.evo.personnelMatters.mapper.RzSubsidyInfoMapper;
import com.evo.personnelMatters.mapper.RzSubsidyMapper;
import com.evo.personnelMatters.service.IRzSubsidyInfoService;
import com.evo.restaurant.domain.RzRestaurantStatistics; import com.evo.restaurant.domain.RzRestaurantStatistics;
import com.evo.restaurant.mapper.RzRestaurantStatisticsMapper; import com.evo.restaurant.mapper.RzRestaurantStatisticsMapper;
import com.evo.system.domain.SysStaff; import com.evo.system.domain.SysStaff;
import com.evo.system.domain.SysStaffDetail; import com.evo.system.domain.SysStaffDetail;
import com.evo.system.mapper.SysDictDataMapper;
import com.evo.system.mapper.SysStaffDetailMapper; import com.evo.system.mapper.SysStaffDetailMapper;
import com.evo.system.utils.SubsidyCalculationUtils; import com.evo.system.utils.SubsidyCalculationUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -28,7 +22,6 @@ import java.math.RoundingMode;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -180,8 +173,8 @@ public interface SalaryCalculationStrategyExchangeProcessor {
//餐饮扣款 //餐饮扣款
RzRestaurantStatistics rzRestaurantStatistics = SpringUtils.getBean(RzRestaurantStatisticsMapper.class).selectRzRestaurantStatisticsByUserIdAndDate(detail.getStaffId(),rzSalaryDetail.getMonth()); RzRestaurantStatistics rzRestaurantStatistics = SpringUtils.getBean(RzRestaurantStatisticsMapper.class).selectRzRestaurantStatisticsByUserIdAndDate(detail.getStaffId(),rzSalaryDetail.getMonth());
rzSalaryDetail.setMealFee(rzRestaurantStatistics.getPersonalSumConsumption()); rzSalaryDetail.setMealFee(rzRestaurantStatistics.getPersonalSumConsumption());
//超过1个工作日时长
if(ycHours.compareTo(cqHours) != 0){ if(ycHours.compareTo(cqHours) != 0 && ycHours.subtract(cqHours).intValue() > 8){
Long ycDays = ycHours.divide(Constants.DAY_WORK_HOUR).longValue(); Long ycDays = ycHours.divide(Constants.DAY_WORK_HOUR).longValue();
//补助总钱数 //补助总钱数
BigDecimal bzAmount = rzSalaryDetail.getLevelSubsidies().add(rzSalaryDetail.getContractSubsidies()).add(rzSalaryDetail.getSenioritySalary()).add(rzSalaryDetail.getSocialSubsidies()); BigDecimal bzAmount = rzSalaryDetail.getLevelSubsidies().add(rzSalaryDetail.getContractSubsidies()).add(rzSalaryDetail.getSenioritySalary()).add(rzSalaryDetail.getSocialSubsidies());