From 595d0f4896bdbb2feda4378dcbee4010bfdfbf56 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Thu, 5 Jun 2025 10:43:07 +0800
Subject: [PATCH] 1

---
 ...aryCalculationStrategyExchangeProcessor.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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