调薪说明

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())

src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java

@@ -62,6 +62,11 @@ public class SalaryArchiveImportHandleParam {
      */
     boolean isProcess;
 
+    /**
+     * 说明
+     */
+    String description;
+
     //*****************************************************************/
 
     Long currentEmployeeId;

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);

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())