From 41c56b1bd4f966e0713098321902c19bb7e30fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 22 Feb 2023 19:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java | 2 +-
 .../salaryarchive/param/SalaryArchiveImportHandleParam.java  | 5 +++++
 .../salary/process/salaryArchive/SalaryArchiveActionAPI.java | 2 +-
 .../salary/service/impl/SalaryArchiveExcelServiceImpl.java   | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
index f1cc39d43..6bb3b7b60 100644
--- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
+++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
@@ -854,7 +854,7 @@ public class SalaryArchiveExcelBO extends Service {
                         .adjustReason(StringUtils.isEmpty(salaryItemAdjustReason) ? SalaryArchiveItemAdjustReasonEnum.INIT.getValue() : salaryItemAdjustReason)
                         .salaryItemId(salaryItemId)
                         .itemValue(cellVal)
-                        .description("")
+                        .description(importHandleParam.getDescription())
                         .operator(importHandleParam.getCurrentEmployeeId())
                         .operateTime(importHandleParam.getNowTime())
                         .createTime(importHandleParam.getNowTime())
diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
index f3f0baf63..cf5173288 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
@@ -62,6 +62,11 @@ public class SalaryArchiveImportHandleParam {
      */
     boolean isProcess;
 
+    /**
+     * 说明
+     */
+    String description;
+
     //*****************************************************************/
 
     Long currentEmployeeId;
diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java
index cc10edaa7..1bc669356 100644
--- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java
+++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java
@@ -87,7 +87,7 @@ public class SalaryArchiveActionAPI {
     }
 
     @POST
-    @Path("/salaryArchiveId")
+    @Path("/salaryArchiveInfo")
     @Produces(MediaType.APPLICATION_JSON)
     public String adjustmentSalaryArchive(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index 812613c04..370c52344 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -704,6 +704,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
 
         return SalaryArchiveImportHandleParam.builder()
                 .isProcess(param.isProcess())
+                .description(param.getDescription())
                 .listType(listType)
                 .importType(importType)
                 .currentEmployeeId((long) user.getUID())