From b6f8e857d230ffa666ec541c277d09103341eec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 28 Jul 2022 15:42:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A1=A3=E6=A1=88=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE=E5=A4=8D=202=E3=80=81?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=A1=A3=E6=A1=88=203=E3=80=81=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=A5=E8=81=8C=E3=80=81=E7=A6=BB=E8=81=8C=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=BD=9C=E4=B8=BA=E6=A0=B8=E7=AE=97=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/biz/SalaryArchiveBiz.java   |  2 +
 .../param/SalaryArchiveImportHandleParam.java |  6 ++
 .../mapper/archive/SalaryArchiveMapper.java   |  8 ++
 .../mapper/archive/SalaryArchiveMapper.xml    | 16 ++++
 .../salary/service/SalaryArchiveService.java  |  2 +
 .../impl/SalaryAcctEmployeeServiceImpl.java   | 15 ++--
 .../impl/SalaryArchiveServiceImpl.java        | 76 +++++++++++++------
 7 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/src/com/engine/salary/biz/SalaryArchiveBiz.java b/src/com/engine/salary/biz/SalaryArchiveBiz.java
index 96c09e883..c16256c76 100644
--- a/src/com/engine/salary/biz/SalaryArchiveBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveBiz.java
@@ -74,4 +74,6 @@ public class SalaryArchiveBiz {
             sqlSession.close();
         }
     }
+
+
 }
diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
index 92410f3cc..ec9a1ca99 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportHandleParam.java
@@ -115,6 +115,12 @@ public class SalaryArchiveImportHandleParam {
      */
     List<SalaryArchivePO> salaryArchiveSaves;
 
+    /**
+     * 待修改薪资档案
+     */
+    List<SalaryArchivePO> salaryArchiveUpdates;
+
+
     /**
      * 待保存薪资档案-个税扣缴义务人
      */
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
index a02ad4677..b2f69593f 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
@@ -15,6 +15,14 @@ public interface SalaryArchiveMapper {
      * @return 返回集合，没有返回空List
      */
 	List<SalaryArchivePO> listAll();
+
+	/**
+	 * 修改，修改所有字段
+	 *
+	 * @param salaryArchive 修改的记录
+	 * @return 返回影响行数
+	 */
+	int update(SalaryArchivePO salaryArchive);
     
 
 	/**
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index a1370c0f8..a4174ff39 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -38,6 +38,22 @@
         WHERE delete_type = 0
     </select>
 
+    <update id="update" parameterType="com.engine.salary.entity.salaryarchive.po.SalaryArchivePO">
+        UPDATE hrsa_salary_archive
+        <set>
+            employee_id=#{employeeId},
+            create_time=#{createTime},
+            update_time=#{updateTime},
+            creator=#{creator},
+            delete_type=#{deleteType},
+            tenant_key=#{tenantKey},
+            tax_agent_id=#{taxAgentId},
+            pay_start_date=#{payStartDate},
+            pay_end_date=#{payEndDate},
+        </set>
+        WHERE id = #{id}
+    </update>
+
     <!-- 根据主键获取单条记录 -->
     <select id="getById" resultMap="BaseResultMap" parameterType="Long">
         SELECT
diff --git a/src/com/engine/salary/service/SalaryArchiveService.java b/src/com/engine/salary/service/SalaryArchiveService.java
index ee7ae86f2..88da89521 100644
--- a/src/com/engine/salary/service/SalaryArchiveService.java
+++ b/src/com/engine/salary/service/SalaryArchiveService.java
@@ -39,6 +39,8 @@ public interface SalaryArchiveService {
      */
     SalaryArchivePO getById(Long salaryArchiveId);
 
+    List<SalaryArchivePO> listSome(SalaryArchivePO po);
+
     /**
      * 薪资档案列表（分页）
      *
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 29d713a90..6f0253400 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -66,7 +66,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 //    private SalaryComparisonResultService salaryComparisonResultService;
 
     private SalarySobService getSalarySobService(User user) {
-        return (SalarySobService) ServiceUtil.getService(SalarySobServiceImpl.class, user);
+        return ServiceUtil.getService(SalarySobServiceImpl.class, user);
     }
 
     private SalaryEmployeeService getSalaryEmployeeService(User user) {
@@ -391,13 +391,12 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         // 根据薪资账套查询薪资周期
         SalarySobCycleDTO salarySobCycleDTO = getSalarySobService(user).getSalarySobCycle(salaryAcctRecordPO.getSalarySobId(), SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()));
 
-        List<DataCollectionEmployee> finalSalaryEmployees = new ArrayList<>();
-        // 根据薪资账套的"核算人员范围"过滤入职日期大于薪资周期止的人员
-        salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> StringUtils.isBlank(salaryEmployee.getCompanystartdate()) || (SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()) != null && SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()).compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) <= 0)).collect(Collectors.toList());
-
-
-        // 根据薪资账套的"核算人员范围"过滤离职日期小于薪资周期起的人员
-        salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> StringUtils.isBlank(salaryEmployee.getDismissdate()) || (SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()) != null && SalaryDateUtil.stringToDate(salaryEmployee.getDismissdate()).compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) > 0)).collect(Collectors.toList());
+//        // 根据薪资账套的"核算人员范围"过滤入职日期大于薪资周期止的人员
+//        salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> StringUtils.isBlank(salaryEmployee.getCompanystartdate()) || (SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()) != null && SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()).compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) <= 0)).collect(Collectors.toList());
+//
+//
+//        // 根据薪资账套的"核算人员范围"过滤离职日期小于薪资周期起的人员
+//        salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> StringUtils.isBlank(salaryEmployee.getDismissdate()) || (SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()) != null && SalaryDateUtil.stringToDate(salaryEmployee.getDismissdate()).compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) > 0)).collect(Collectors.toList());
 
 
         //查询账套对应的扣缴义务人
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index a953217af..b5f43ca2d 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -102,6 +102,12 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         return salaryArchiveMapper.getById(salaryArchiveId);
     }
 
+    @Override
+    public List<SalaryArchivePO> listSome(SalaryArchivePO po) {
+        // 获取薪资档案数据
+        return getSalaryArchiveMapper().listSome(po);
+    }
+
     @Override
     public PageInfo<SalaryArchiveListDTO> listPage(SalaryArchiveQueryParam queryParam) {
         long currentEmployeeId = user.getUID();
@@ -657,13 +663,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             Map<String, Object> map = data.get(i);
             List<String> headers = Lists.newArrayList();
             map.keySet().forEach(headers::add);
-            int effectiveTimeIndex = 0;
-            for (int j = 0; j < headers.size(); j++) {
-                if (headers.get(j).equals(SalaryI18nUtil.getI18nLabel(85904, "生效日期"))) {
-                    effectiveTimeIndex = j;
-                    break;
-                }
-            }
             map.put("index", i + 2);
             // 3.校验行内容
             boolean isError = singleRowCheck(importType, Lists.newArrayList(), map, headers, excelComments, errorCount, importHandleParam);
@@ -766,6 +765,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
                 .today(now)
                 // 待保存薪资档案
                 .salaryArchiveSaves(Lists.newArrayList())
+                // 待修改薪资档案-
+                .salaryArchiveUpdates(Lists.newArrayList())
                 // 待保存薪资档案-个税扣缴义务人
                 .salaryArchiveTaxAgentSaves(Lists.newArrayList())
                 // 待保存薪资档案-薪资项目
@@ -1055,21 +1056,51 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         return isError;
     }
 
+    /**
+     * 构建薪资档案
+     * @param isInit
+     * @param payStartDate
+     * @param payEndDate
+     * @param employeeId
+     * @param taxAgentId
+     * @param importHandleParam
+     * @return
+     */
     private SalaryArchivePO buildSalaryArchive(boolean isInit, Date payStartDate, Date payEndDate, Long employeeId, Long taxAgentId, SalaryArchiveImportHandleParam importHandleParam) {
-        Optional<SalaryArchiveListDTO> optionalSA = importHandleParam.getSalaryArchives().stream().filter(p -> p.getEmployeeId().equals(employeeId) && p.getTaxAgentId().equals(taxAgentId)).findFirst();
+        Optional<SalaryArchiveListDTO> optionalSA = importHandleParam.getSalaryArchives().stream()
+                .filter(p -> p.getEmployeeId().equals(employeeId) && p.getTaxAgentId().equals(taxAgentId))
+                .findFirst();
         SalaryArchivePO salaryArchive = null;
         if (optionalSA.isPresent()) {
             // 修改档案
             SalaryArchiveListDTO sa = optionalSA.get();
-            salaryArchive = new SalaryArchivePO();
-            salaryArchive.setId(sa.getId());
-            salaryArchive.setEmployeeId(sa.getEmployeeId());
-            salaryArchive.setTaxAgentId(sa.getTaxAgentId());
-            salaryArchive.setPayStartDate(payStartDate);
-            salaryArchive.setPayEndDate(payEndDate);
+            salaryArchive = SalaryArchivePO.builder()
+                    .id(sa.getId())
+                    .employeeId(sa.getEmployeeId())
+                    .taxAgentId(sa.getTaxAgentId())
+                    .payStartDate(payStartDate)
+                    .payEndDate(payEndDate)
+                    .createTime(importHandleParam.getNowTime())
+                    .updateTime(importHandleParam.getNowTime())
+                    .creator((long) user.getUID())
+                    .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                    .deleteType(0)
+                    .build();
+            importHandleParam.getSalaryArchiveUpdates().add(salaryArchive);
         } else if (employeeId != null && isInit) {
             // 新增档案
-            salaryArchive = SalaryArchivePO.builder().id(IdGenerator.generate()).employeeId(employeeId).taxAgentId(taxAgentId).payStartDate(payStartDate).payEndDate(payEndDate).createTime(importHandleParam.getNowTime()).updateTime(importHandleParam.getNowTime()).creator((long) user.getUID()).tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY).build();
+            salaryArchive = SalaryArchivePO.builder()
+                    .id(IdGenerator.generate())
+                    .employeeId(employeeId)
+                    .taxAgentId(taxAgentId)
+                    .payStartDate(payStartDate)
+                    .payEndDate(payEndDate)
+                    .createTime(importHandleParam.getNowTime())
+                    .updateTime(importHandleParam.getNowTime())
+                    .creator((long) user.getUID())
+                    .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                    .deleteType(0)
+                    .build();
 
             importHandleParam.getSalaryArchiveSaves().add(salaryArchive);
         }
@@ -1452,9 +1483,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
     private void handleImportData(boolean isInit, SalaryArchiveImportHandleParam importHandleParam) {
 
         List<SalaryArchivePO> salaryArchiveSaves = importHandleParam.getSalaryArchiveSaves();
-        List<SalaryArchiveTaxAgentPO> salaryArchiveTaxAgentSaves = importHandleParam.getSalaryArchiveTaxAgentSaves();
+        List<SalaryArchivePO> salaryArchiveUpdates = importHandleParam.getSalaryArchiveUpdates();
         List<SalaryArchiveItemPO> salaryArchiveItemSaves = importHandleParam.getSalaryArchiveItemSaves();
-        List<Long> salaryArchiveTaxAgentDelTaxAgentIds = importHandleParam.getSalaryArchiveTaxAgentDelTaxAgentIds();
         List<Long> salaryArchiveItemDelSalaryItemIds = importHandleParam.getSalaryArchiveItemDelSalaryItemIds();
         // 初始化导入
         if (isInit) {
@@ -1470,23 +1500,21 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
                 }
             }
         } else {
-            if (CollectionUtils.isNotEmpty(salaryArchiveTaxAgentDelTaxAgentIds)) {
-                salaryArchiveTaxAgentMapper.deleteBatchIds(salaryArchiveTaxAgentDelTaxAgentIds);
-            }
             if (CollectionUtils.isNotEmpty(salaryArchiveItemDelSalaryItemIds)) {
                 salaryArchiveItemMapper.deleteBatchIds(salaryArchiveItemDelSalaryItemIds);
             }
         }
 
+        // 修改薪资档案
+        if (CollectionUtils.isNotEmpty(salaryArchiveUpdates)) {
+            salaryArchiveUpdates.forEach(getSalaryArchiveMapper()::update);
+        }
+
         // 新增薪资档案
         if (CollectionUtils.isNotEmpty(salaryArchiveSaves)) {
             // 薪资档案
             salaryArchiveMapper.batchInsert(salaryArchiveSaves);
         }
-        // 薪资档案-个税扣缴义务人
-        if (CollectionUtils.isNotEmpty(salaryArchiveTaxAgentSaves)) {
-            salaryArchiveTaxAgentMapper.batchInsert(salaryArchiveTaxAgentSaves);
-        }
         // 薪资档案-薪资项目
         if (CollectionUtils.isNotEmpty(salaryArchiveItemSaves)) {
             salaryArchiveItemMapper.batchInsert(salaryArchiveItemSaves);