From a04f4a915f20d279a85bf7e9fdbca6dfa5a468b6 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 5 Dec 2022 15:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E5=8F=AF=E8=B0=83=E5=B7=AE?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=88=86=E9=A1=B5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/SICompensationService.java |  2 +-
 .../impl/SICompensationServiceImpl.java       | 48 +++++++++++++------
 .../salary/web/SIAccountController.java       |  2 +-
 .../salary/wrapper/SIAccountWrapper.java      |  2 +-
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/com/engine/salary/service/SICompensationService.java b/src/com/engine/salary/service/SICompensationService.java
index 6dfe429f2..b79c29fc4 100644
--- a/src/com/engine/salary/service/SICompensationService.java
+++ b/src/com/engine/salary/service/SICompensationService.java
@@ -11,7 +11,7 @@ import java.util.Map;
 
 public interface SICompensationService {
 
-    PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param);
+    List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param);
 
     List<Map<String, String>> compensationCategoryType(Long id);
 
diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
index 33cf6047d..7715b5d9b 100644
--- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
@@ -85,7 +85,7 @@ public class SICompensationServiceImpl extends Service implements SICompensation
      * 可调差人员
      */
     @Override
-    public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) {
+    public List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) {
         // 当前登录人员
         Long currentEmployeeId = (long) user.getUID();
 
@@ -103,20 +103,40 @@ public class SICompensationServiceImpl extends Service implements SICompensation
 
         }
 
-        // 分页
-        PageInfo<HrmInfoDTO> page = new PageInfo<>();
-        if (resultData.size() == 0) {
-            return page;
-        }
-        page.setTotal(resultData.size());
-
-        page.setList(SalaryPageUtil.subList(param.getPageNum(), param.getPageSize(), resultData));
-        page.setPageSize(param.getPageSize());
-        page.setPageNum(param.getPageNum());
-
-
-        return page;
+        return resultData;
     }
+//    public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) {
+//        // 当前登录人员
+//        Long currentEmployeeId = (long) user.getUID();
+//
+//        //查询账单月份+个税扣缴义务人下的社保福利正常缴纳人员列表
+//        List<InsuranceAccountDetailPO> normalDataList = getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
+//        List<Long> empIds = normalDataList.stream().map(InsuranceAccountDetailPO::getEmployeeId).collect(Collectors.toList());
+//
+//        List<HrmInfoDTO> resultData = new ArrayList<>();
+//        if (empIds.size() > 0) {
+//            List<List<Long>> partition = Lists.partition(empIds, 1000);
+//            partition.forEach(p -> {
+//                param.setIds(p);
+//                resultData.addAll(getEmployMapper().listHrmInfoByIdAndName(param));
+//            });
+//
+//        }
+//
+//        // 分页
+//        PageInfo<HrmInfoDTO> page = new PageInfo<>();
+//        if (resultData.size() == 0) {
+//            return page;
+//        }
+//        page.setTotal(resultData.size());
+//
+//        page.setList(SalaryPageUtil.subList(param.getPageNum(), param.getPageSize(), resultData));
+//        page.setPageSize(param.getPageSize());
+//        page.setPageNum(param.getPageNum());
+//
+//
+//        return page;
+//    }
 
     /**
      * 调差福利项
diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java
index 8b740d537..790c125f0 100644
--- a/src/com/engine/salary/web/SIAccountController.java
+++ b/src/com/engine/salary/web/SIAccountController.java
@@ -710,7 +710,7 @@ public class SIAccountController {
     public String getEmployeeListToCompensation(@Context HttpServletRequest request, @Context HttpServletResponse response,
                                             @RequestBody HrmQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<HrmQueryParam, PageInfo<HrmInfoDTO>>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param);
+        return new ResponseResult<HrmQueryParam, List<HrmInfoDTO>>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param);
     }
 
     /**
diff --git a/src/com/engine/salary/wrapper/SIAccountWrapper.java b/src/com/engine/salary/wrapper/SIAccountWrapper.java
index cc886cb2f..3180d9979 100644
--- a/src/com/engine/salary/wrapper/SIAccountWrapper.java
+++ b/src/com/engine/salary/wrapper/SIAccountWrapper.java
@@ -63,7 +63,7 @@ public class SIAccountWrapper extends Service {
     /**
      * 可调差人员列表
      */
-    public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) {
+    public List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) {
 
         return getSICompensationService(user).getEmployeeListToCompensation(hrmQueryParam);
     }