From 3c3c67975728cd27381af77081802429b9f0a4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 6 Jul 2022 10:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=AA=E7=A8=8E=E6=89=A3?=
 =?UTF-8?q?=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA=E4=B8=8B=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=BA=BA=E5=91=98=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/web/TaxAgentController.java  | 10 ++++++++++
 src/com/engine/salary/wrapper/TaxAgentWrapper.java | 14 ++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/web/TaxAgentController.java b/src/com/engine/salary/web/TaxAgentController.java
index 6b67b9de4..8695bf32b 100644
--- a/src/com/engine/salary/web/TaxAgentController.java
+++ b/src/com/engine/salary/web/TaxAgentController.java
@@ -274,6 +274,16 @@ public class TaxAgentController {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<Collection<Long>, List<Map<String, Object>>>(user).run(getTaxAgentWrapper(user)::selectListAsAdmin);
     }
+
+
+    @GET
+    @Path("/getEmpListInTaxAgent")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getEmpListInTaxAgent(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<Long, List<TaxAgentManageRangeEmployeeDTO>>(user).run(getTaxAgentWrapper(user)::getEmpListInTaxAgent, id);
+    }
+
     /* ******* 个税扣缴义务人 end ***********************************************************************************************/
 
     /* ******* 分管理员 start ***********************************************************************************************/
diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
index 70e49f9dd..6dd21c58b 100644
--- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
@@ -5,10 +5,7 @@ import com.engine.core.impl.Service;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.hrm.HrmStatus;
 import com.engine.salary.entity.taxagent.bo.TaxAgentBO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeOptionDTO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentFormDTO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeFormDTO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeListDTO;
+import com.engine.salary.entity.taxagent.dto.*;
 import com.engine.salary.entity.taxagent.param.*;
 import com.engine.salary.entity.taxagent.po.TaxAgentAdminPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
@@ -350,4 +347,13 @@ public class TaxAgentWrapper extends Service {
         getTaxAgentManageRangeService(user).deleteByIds(ids);
         return StringUtils.EMPTY;
     }
+
+    /**
+     * 获取个税管理的人员情况
+     * @param id
+     * @return
+     */
+    public List<TaxAgentManageRangeEmployeeDTO> getEmpListInTaxAgent(Long id) {
+        return getTaxAgentService(user).listTaxAgentAndEmployeeTree((long) user.getUID());
+    }
 }