From 4e4c190f3157a3c0bcfc02537783c76eab969fea Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 30 May 2022 17:31:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java  |  2 +-
 .../po/InsuranceArchivesEmployeePO.java       |  2 ++
 .../engine/salary/enums/UserStatusEnum.java   |  2 --
 .../mapper/datacollection/EmployMapper.xml    | 13 ++++++++++--
 .../InsuranceAccountDetailMapper.xml          |  1 +
 .../service/impl/RecordsBuildServiceImpl.java |  5 +++--
 .../service/impl/SISchemeServiceImpl.java     | 20 ++++++++++++++++---
 7 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 20bad7089..7ab2fbddd 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -810,7 +810,7 @@ public class SIArchivesBiz {
                 map.put("siSchemeId", item.getSiSchemeId());
                 map.put("fundSchemeId", item.getFundSchemeId());
                 map.put("otherSchemeId",item.getOtherSchemeId());
-                map.put("status", item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDescription());
+                map.put("status", item.getUserStatus() != null ? UserStatusEnum.values()[item.getUserStatus()].getDescription() : "");
                 if (socialItem != null) {
                     map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId()));
                     Map<String, Object> socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java
index eef707af7..e12cde01f 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java
@@ -34,6 +34,8 @@ public class InsuranceArchivesEmployeePO {
 
     private BigDecimal position;
 
+    private Integer userStatus;
+
     private UserStatusEnum userStatusEnum;
 
     private String hiredate;
diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java
index c898d8ada..12743967d 100644
--- a/src/com/engine/salary/enums/UserStatusEnum.java
+++ b/src/com/engine/salary/enums/UserStatusEnum.java
@@ -83,6 +83,4 @@ public enum UserStatusEnum {
         return Arrays.stream(UserStatusEnum.values()).filter(v -> v != INVALID).collect(Collectors.toList());
     }
 
-
-
 }
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index 6cdb6c957..10898e736 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -12,8 +12,17 @@
     </select>
 
     <select id="getEmployeeByIds" resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
-        select e.ID as employeeId,
-        e.LASTNAME as username
+        select e.id as employeeId,
+        e.lastname as username,
+        e.status as status,
+        e.workcode as workcode,
+        d.departmentname as departmentName,
+        d.id as departmentId,
+        c.jobtitlename as jobtitleName,
+        c.id as jobtitleId,
+        e.companystartdate as companystartdate,
+        e.mobile as mobile,
+        b.dismissdate as dismissdate
         from hrmresource e
         where e.status not in (7)
         <if test="collection != null and collection.size()>0">
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 8e65f8975..00327e607 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -51,6 +51,7 @@
     <sql id="baseColumns">
         t.id
         , t.employee_id
+        , e.status as employee_status
         , t.bill_month
         , t.bill_status
         , t.payment_status
diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
index 91cdc4238..a64cd58bb 100644
--- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
+++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
@@ -11,6 +11,7 @@ import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO;
 import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO;
 import com.engine.salary.entity.taxrate.TaxAgent;
+import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.siaccount.BillStatusEnum;
 import com.engine.salary.enums.siaccount.ResourceFromEnum;
 import com.engine.salary.mapper.TaxAgentMapper;
@@ -44,7 +45,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
             return result;
         }
         List<Long> employeeIds = list.stream().map(item -> item.getEmployeeId()).collect(Collectors.toList());
-        List<DataCollectionEmployee> employeeByIds = MapperProxyFactory.getProxy(EmployMapper.class).getEmployeeByIds(employeeIds);
+        List<DataCollectionEmployee> employeeByIds = MapperProxyFactory.getProxy(EmployMapper.class).getEmployeeByIdsAll(employeeIds);
         if (CollectionUtils.isEmpty(employeeByIds)) {
             return result;
         }
@@ -64,7 +65,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
             record.put("department", simpleEmployee.getDepartmentName());
             record.put("supplementaryMonth", item.getSupplementaryMonth());
             record.put("mobile", simpleEmployee.getMobile());
-            record.put("employeeStatus", simpleEmployee.getStatus());
+            record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.values()[Integer.parseInt(simpleEmployee.getStatus())].getDescription() : "");
             ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class);
             record.put("sourceFrom", SalaryI18nUtil.getI18nLabel(from.getLabelId(), from.getDefaultLabel()));
             record.put("socialPayOrg", paymentMap.get(item.getSocialPayOrg()) == null ? "" : paymentMap.get(item.getSocialPayOrg()).getName());
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 2ef403831..f70f4605b 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -200,15 +200,29 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         if (CollectionUtils.isEmpty(employeeIds)) {
             return records;
         }
+        List<InsuranceArchivesSocialSchemePO> socialList = new ArrayList<>();
+        List<InsuranceArchivesFundSchemePO> fundList = new ArrayList<>();
+        List<InsuranceArchivesOtherSchemePO> otherList = new ArrayList<>();
+
+        for(int i = 0; i < employeeIds.size(); i+=1000) {
+            int end = i + 1000;
+            if(i + 1000 >= employeeIds.size()) {
+                end = employeeIds.size();
+            }
+            List<Long> ids = employeeIds.subList(i, end);
+            socialList.addAll(getSocialSchemeMapper().getSocialByEmployeeId(ids));
+            fundList.addAll(getFundSchemeMapper().getFundByEmployeeId(ids));
+            otherList.addAll(getOtherSchemeMapper().getOtherByEmployeeId(ids));
+        }
 
         Map<Long, InsuranceArchivesSocialSchemePO> socialSchemePOMap =
-                getSocialSchemeMapper().getSocialByEmployeeId(employeeIds)
+                socialList
                 .stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity()));
         Map<Long, InsuranceArchivesFundSchemePO> fundSchemePOMap =
-                getFundSchemeMapper().getFundByEmployeeId(employeeIds)
+                fundList
                 .stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity()));
         Map<Long, InsuranceArchivesOtherSchemePO> otherSchemePOMap =
-                getOtherSchemeMapper().getOtherByEmployeeId(employeeIds)
+                otherList
                 .stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity()));
         insuranceArchivesEmployeePOS.forEach(item -> {
             InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getEmployeeId());