From db09f8047ec49fefc4b7a74559a1f6839d372d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 15 Mar 2023 11:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/web/AddUpDeductionController.java      |  8 ++++++++
 .../salary/web/AddUpSituationController.java      | 13 ++++++++-----
 .../salary/wrapper/AddUpSituationWrapper.java     | 15 ++++-----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/com/engine/salary/web/AddUpDeductionController.java b/src/com/engine/salary/web/AddUpDeductionController.java
index 5d421153e..42ff50530 100644
--- a/src/com/engine/salary/web/AddUpDeductionController.java
+++ b/src/com/engine/salary/web/AddUpDeductionController.java
@@ -40,6 +40,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * 累计专项附加扣除
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
 @Slf4j
 public class AddUpDeductionController {
 
diff --git a/src/com/engine/salary/web/AddUpSituationController.java b/src/com/engine/salary/web/AddUpSituationController.java
index 7db7bafac..0c31aa578 100644
--- a/src/com/engine/salary/web/AddUpSituationController.java
+++ b/src/com/engine/salary/web/AddUpSituationController.java
@@ -38,17 +38,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * 往期累计
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
 @Slf4j
 public class AddUpSituationController {
     private AddUpSituationWrapper getAddUpSituationWrapper(User user) {
         return ServiceUtil.getService(AddUpSituationWrapper.class, user);
     }
 
-    /**
-     * 数据采集-累计专项附加扣除列表的高级搜索
-     *
-     * @return
-     */
     @GET
     @Path("/getSearchCondition")
     @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/com/engine/salary/wrapper/AddUpSituationWrapper.java b/src/com/engine/salary/wrapper/AddUpSituationWrapper.java
index fbe8b90dc..9e76f49b2 100644
--- a/src/com/engine/salary/wrapper/AddUpSituationWrapper.java
+++ b/src/com/engine/salary/wrapper/AddUpSituationWrapper.java
@@ -5,14 +5,13 @@ import com.engine.core.impl.Service;
 import com.engine.salary.entity.datacollection.AddUpSituation;
 import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO;
 import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO;
-import com.engine.salary.entity.datacollection.param.*;
+import com.engine.salary.entity.datacollection.param.AddUpSituationDeleteParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationImportParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.service.AddUpSituationService;
-import com.engine.salary.service.SalaryEmployeeService;
-import com.engine.salary.service.TaxAgentService;
 import com.engine.salary.service.impl.AddUpSituationServiceImpl;
-import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
-import com.engine.salary.service.impl.TaxAgentServiceImpl;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
@@ -37,12 +36,6 @@ public class AddUpSituationWrapper extends Service {
     private AddUpSituationService getAddUpSituationService(User user) {
         return ServiceUtil.getService(AddUpSituationServiceImpl.class, user);
     }
-    private TaxAgentService getTaxAgentV2Service(User user) {
-        return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
-    }
-    private SalaryEmployeeService getSalaryEmployeeService(User user) {
-        return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
-    }
 
     /**
      * 数据采集-累计情况列表的高级搜索