From d21258596a720edb1b0cfe7a1de30d9e0839b901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 30 Oct 2024 17:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=85=A5=E4=BA=BA=E5=91=98=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryarchive/bo/SalaryArchiveBO.java     | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
index fabbfd1b0..2855c40d6 100644
--- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
+++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
@@ -12,13 +12,12 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO;
 import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentEmpChangePO;
-import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
 import com.engine.salary.enums.taxagent.TaxAgentEmpChangeTypeEnum;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
-import com.google.common.collect.Lists;
 import com.engine.salary.util.db.IdGenerator;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -285,40 +284,42 @@ public class SalaryArchiveBO {
             // 如果是新增 说明：如果没有档案，则新增，如果有档案而且是停薪，就挪到待定薪中，以个税扣缴义务人和人员id判断唯一
             if (change.getChangeType() == TaxAgentEmpChangeTypeEnum.ADD.getValue()) {
                 if (salaryArchive != null) {
-                    // 停薪中跳回待定薪：从a调动到b又调动到a，或者是删除待办后再覆盖
-                    if (stopStatus.contains(salaryArchive.getRunStatus())) {
-                        // 跳回待定薪
-                        salaryArchive.setRunStatus(SalaryArchiveStatusEnum.PENDING.getValue());
-                        if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())) {
-                            salaryArchive.setPayStartDate(today);
-                            salaryArchive.setPayEndDate(null);
-                        }
-                        salaryArchiveUpdateTodoList.add(salaryArchive);
-                        // 待停薪到停薪的就要复制最新的薪资项目
-                        if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())) {
-                            // 拷贝最新的薪资项目数据
-                            List<SalaryArchiveItemPO> salaryArchiveItemValuelList = salaryArchiveItemList.stream().filter(i -> i.getSalaryArchiveId().equals(salaryArchive.getId())).collect(Collectors.toList());
-                            salaryArchiveItemValuelList.forEach(i -> {
-                                salaryArchiveItemAddTodos.add(SalaryArchiveItemPO.builder()
-                                        .id(IdGenerator.generate())
-                                        .salaryArchiveId(salaryArchive.getId())
-                                        .employeeId(salaryArchive.getEmployeeId())
-                                        .effectiveTime(today)
-                                        .adjustReason(SalaryArchiveItemAdjustReasonEnum.INIT.getValue())
-                                        .salaryItemId(i.getSalaryItemId())
-                                        .itemValue(i.getItemValue())
-                                        .description("")
-                                        // 不用设置操作人
-                                        .operateTime(now)
-                                        .createTime(now)
-                                        .updateTime(now)
-                                        .creator(currentEmployeeId)
-                                        .deleteType(NumberUtils.INTEGER_ZERO)
-                                        .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
-                                        .build());
-                            });
-                        }
-                    }
+                    //存在历史档案不做处理
+
+//                    // 停薪中跳回待定薪：从a调动到b又调动到a，或者是删除待办后再覆盖
+//                    if (stopStatus.contains(salaryArchive.getRunStatus())) {
+//                        // 跳回待定薪
+//                        salaryArchive.setRunStatus(SalaryArchiveStatusEnum.PENDING.getValue());
+//                        if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())) {
+//                            salaryArchive.setPayStartDate(today);
+//                            salaryArchive.setPayEndDate(null);
+//                        }
+//                        salaryArchiveUpdateTodoList.add(salaryArchive);
+//                        // 待停薪到停薪的就要复制最新的薪资项目
+//                        if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())) {
+//                            // 拷贝最新的薪资项目数据
+//                            List<SalaryArchiveItemPO> salaryArchiveItemValuelList = salaryArchiveItemList.stream().filter(i -> i.getSalaryArchiveId().equals(salaryArchive.getId())).collect(Collectors.toList());
+//                            salaryArchiveItemValuelList.forEach(i -> {
+//                                salaryArchiveItemAddTodos.add(SalaryArchiveItemPO.builder()
+//                                        .id(IdGenerator.generate())
+//                                        .salaryArchiveId(salaryArchive.getId())
+//                                        .employeeId(salaryArchive.getEmployeeId())
+//                                        .effectiveTime(today)
+//                                        .adjustReason(SalaryArchiveItemAdjustReasonEnum.INIT.getValue())
+//                                        .salaryItemId(i.getSalaryItemId())
+//                                        .itemValue(i.getItemValue())
+//                                        .description("")
+//                                        // 不用设置操作人
+//                                        .operateTime(now)
+//                                        .createTime(now)
+//                                        .updateTime(now)
+//                                        .creator(currentEmployeeId)
+//                                        .deleteType(NumberUtils.INTEGER_ZERO)
+//                                        .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+//                                        .build());
+//                            });
+//                        }
+//                    }
                 } else {
                     salaryArchiveAddTodoList.add(SalaryArchivePO.builder()
                             .id(IdGenerator.generate())