From db64368787fa5050c111ece725f4f620e842dd86 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 12 Aug 2024 21:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=96=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../empSalary/controller/EmpSalaryController.java   | 13 +++++++++++--
 .../lihongjie/coal/empSalary/dto/InitSalaryDto.java | 12 ++++++++++++
 .../coal/empSalary/service/EmpSalaryService.java    | 12 ++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/cn/lihongjie/coal/empSalary/dto/InitSalaryDto.java

diff --git a/src/main/java/cn/lihongjie/coal/empSalary/controller/EmpSalaryController.java b/src/main/java/cn/lihongjie/coal/empSalary/controller/EmpSalaryController.java
index e7d6b279..feafba77 100644
--- a/src/main/java/cn/lihongjie/coal/empSalary/controller/EmpSalaryController.java
+++ b/src/main/java/cn/lihongjie/coal/empSalary/controller/EmpSalaryController.java
@@ -6,6 +6,7 @@ import cn.lihongjie.coal.base.dto.CommonQuery;
 import cn.lihongjie.coal.base.dto.IdRequest;
 import cn.lihongjie.coal.empSalary.dto.CreateEmpSalaryDto;
 import cn.lihongjie.coal.empSalary.dto.EmpSalaryDto;
+import cn.lihongjie.coal.empSalary.dto.InitSalaryDto;
 import cn.lihongjie.coal.empSalary.dto.UpdateEmpSalaryDto;
 import cn.lihongjie.coal.empSalary.service.EmpSalaryService;
 
@@ -74,8 +75,16 @@ public class EmpSalaryController {
         return this.service.batchSelectedEmpIds(request);
     }
 
-
-
+    @PostMapping("/initSalary")
+    public Object initSalary(@RequestBody InitSalaryDto request) {
+         this.service.initSalary(request);
+        return true;
+    }
+    @PostMapping("/recalculate")
+    public Object recalculate(@RequestBody IdRequest request) {
+        this.service.recalculate(request);
+        return true;
+    }
 
     @PostMapping("/archive")
     public Object archive(@RequestBody IdRequest request) {
diff --git a/src/main/java/cn/lihongjie/coal/empSalary/dto/InitSalaryDto.java b/src/main/java/cn/lihongjie/coal/empSalary/dto/InitSalaryDto.java
new file mode 100644
index 00000000..3bcd602b
--- /dev/null
+++ b/src/main/java/cn/lihongjie/coal/empSalary/dto/InitSalaryDto.java
@@ -0,0 +1,12 @@
+package cn.lihongjie.coal.empSalary.dto;
+
+import lombok.Data;
+
+import java.util.*;
+
+@Data
+public class InitSalaryDto {
+
+    private String batchId;
+    private List<String> employeesIds;
+}
diff --git a/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java b/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
index 52eb1a40..21b42d57 100644
--- a/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
+++ b/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
@@ -9,6 +9,7 @@ import cn.lihongjie.coal.common.ReflectUtils;
 import cn.lihongjie.coal.empMonthAttendance.entity.EmpMonthAttendanceEntity;
 import cn.lihongjie.coal.empSalary.dto.CreateEmpSalaryDto;
 import cn.lihongjie.coal.empSalary.dto.EmpSalaryDto;
+import cn.lihongjie.coal.empSalary.dto.InitSalaryDto;
 import cn.lihongjie.coal.empSalary.dto.UpdateEmpSalaryDto;
 import cn.lihongjie.coal.empSalary.entity.EmpSalaryEntity;
 import cn.lihongjie.coal.empSalary.mapper.EmpSalaryMapper;
@@ -314,13 +315,16 @@ public class EmpSalaryService extends BaseService<EmpSalaryEntity, EmpSalaryRepo
         }
     }
 
+
+
+
     /** 初始化工资 */
     @SneakyThrows
-    public void initSalary(String batchId, List<String> employeesIds) {
+    public void initSalary(InitSalaryDto initSalaryDto) {
 
-        EmpSalaryBatchEntity batch = batchService.get(batchId);
+        EmpSalaryBatchEntity batch = batchService.get(initSalaryDto.getBatchId());
 
-        List<EmployeeDto> employees = employeeService.getDtoByIds(employeesIds);
+        List<EmployeeDto> employees = employeeService.getDtoByIds(initSalaryDto.getEmployeesIds());
 
         StopWatch stopWatch = new StopWatch("initSalary: " + batch.getId());
 
@@ -390,7 +394,7 @@ public class EmpSalaryService extends BaseService<EmpSalaryEntity, EmpSalaryRepo
 
             stopWatch.start("queryHistorySalary");
 
-            List<EmpSalaryEntity> salaryHis = this.queryHisSalary(employeesIds);
+            List<EmpSalaryEntity> salaryHis = this.queryHisSalary(initSalaryDto.getEmployeesIds());
 
             Map<String, EmpSalaryEntity> salaryHisMap =
                     salaryHis.stream()