From f65f3c01ebd3ad91c0e70b9814a80387e3756052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 19 Jul 2022 10:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/salary/web/SalaryArchiveActionAPIController.java | 2 +- .../salaryArchive/SalaryArchiveActionAPI.java | 5 +---- .../salaryArchive/SalaryArchiveCommon.java | 3 +-- .../salaryArchive/SalaryArchiveInitAction.java | 2 +- .../salaryArchive/SalaryArchiveSalaryItemAdjustAction.java | 3 +-- .../salaryArchive/SalaryArchiveTaxAgentAdjustAction.java | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) rename src/com/engine/salary/{action => process}/salaryArchive/SalaryArchiveActionAPI.java (92%) rename src/com/engine/salary/{action => process}/salaryArchive/SalaryArchiveCommon.java (94%) rename src/com/engine/salary/{action => process}/salaryArchive/SalaryArchiveInitAction.java (98%) rename src/com/engine/salary/{action => process}/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java (95%) rename src/com/engine/salary/{action => process}/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java (98%) diff --git a/src/com/api/salary/web/SalaryArchiveActionAPIController.java b/src/com/api/salary/web/SalaryArchiveActionAPIController.java index bf479e113..039cf4e67 100644 --- a/src/com/api/salary/web/SalaryArchiveActionAPIController.java +++ b/src/com/api/salary/web/SalaryArchiveActionAPIController.java @@ -1,7 +1,7 @@ package com.api.salary.web; -import com.engine.salary.action.salaryArchive.SalaryArchiveActionAPI; +import com.engine.salary.process.salaryArchive.SalaryArchiveActionAPI; import javax.ws.rs.Path; diff --git a/src/com/engine/salary/action/salaryArchive/SalaryArchiveActionAPI.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java similarity index 92% rename from src/com/engine/salary/action/salaryArchive/SalaryArchiveActionAPI.java rename to src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java index 0d8651a84..8ad2239c3 100644 --- a/src/com/engine/salary/action/salaryArchive/SalaryArchiveActionAPI.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java @@ -1,7 +1,6 @@ -package com.engine.salary.action.salaryArchive; +package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; -import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentFormDTO; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam; import com.engine.salary.util.ResponseResult; @@ -10,8 +9,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody; import lombok.extern.slf4j.Slf4j; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; -import weaver.interfaces.workflow.action.Action; -import weaver.soa.workflow.request.RequestInfo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/com/engine/salary/action/salaryArchive/SalaryArchiveCommon.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java similarity index 94% rename from src/com/engine/salary/action/salaryArchive/SalaryArchiveCommon.java rename to src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java index a37fa867d..c11ea85d6 100644 --- a/src/com/engine/salary/action/salaryArchive/SalaryArchiveCommon.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java @@ -1,11 +1,10 @@ -package com.engine.salary.action.salaryArchive; +package com.engine.salary.process.salaryArchive; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import weaver.conn.RecordSet; -import weaver.soa.workflow.request.RequestInfo; import java.util.List; import java.util.Map; diff --git a/src/com/engine/salary/action/salaryArchive/SalaryArchiveInitAction.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java similarity index 98% rename from src/com/engine/salary/action/salaryArchive/SalaryArchiveInitAction.java rename to src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java index b84447d0e..655c58cc1 100644 --- a/src/com/engine/salary/action/salaryArchive/SalaryArchiveInitAction.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java @@ -1,4 +1,4 @@ -package com.engine.salary.action.salaryArchive; +package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; diff --git a/src/com/engine/salary/action/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java similarity index 95% rename from src/com/engine/salary/action/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java rename to src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java index c3c00cb28..9a82fc2af 100644 --- a/src/com/engine/salary/action/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java @@ -1,7 +1,6 @@ -package com.engine.salary.action.salaryArchive; +package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; -import com.engine.salary.action.salaryArchive.SalaryArchiveCommon; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam; import com.engine.salary.service.SalaryArchiveService; diff --git a/src/com/engine/salary/action/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java similarity index 98% rename from src/com/engine/salary/action/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java rename to src/com/engine/salary/process/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java index ec645a875..eb045f98a 100644 --- a/src/com/engine/salary/action/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveTaxAgentAdjustAction.java @@ -1,4 +1,4 @@ -package com.engine.salary.action.salaryArchive; +package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam;