From 06f8dda540a822cd674ace889ed2d9a66c275c63 Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Wed, 27 Nov 2024 17:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=88=90=E6=AF=94=E4=BE=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pusong/business/batch/CalSalaryBatch.java | 2 ++ .../com/pusong/business/service/impl/PsSalaryServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java index c31cb7d..7c67b1a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java @@ -262,11 +262,13 @@ public class CalSalaryBatch { //服务类型金额 - 成本 BigDecimal amount = item.getBusinessAmount().subtract(cost); // ×比例 + rate = rate.multiply(new BigDecimal("0.01")); salary = salary.add(amount.multiply(rate)); }else{//（按照类型算） for (PsContractBusinessDetailVo detail : item.getDetailVoList()){ //比例 BigDecimal rateConfig = configMap.get(detail.getBusinessProject()) == null ? new BigDecimal("0.1") : configMap.get(detail.getBusinessProject()); + rateConfig = rateConfig.multiply(new BigDecimal("0.01")); //成本 BigDecimal rateCost = costMap.get(detail.getBusinessProject()) == null ? new BigDecimal(cbStr):costMap.get(detail.getBusinessProject()); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java index 19104e6..0cbf4b8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java @@ -66,7 +66,7 @@ public class PsSalaryServiceImpl implements IPsSalaryService { LocalDateTime deadline = bo.getEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); LocalDate thisMonth = LocalDate.now(); List adds = calSalaryBatch.calcData(deadline, thisMonth, false); - List records= new ArrayList<>(); + List records = new ArrayList<>(); records.addAll(result.getRecords()); // long diffNum = result.getSize() - result.getRecords().size();