From 12bbfeceae045480081e915101fda3e5f48c211a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 11 Mar 2025 11:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=A3=E9=99=A4=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deductionamount/po/DeductionAmountPO.java | 10 ++--
 .../impl/DeductionAmountServiceImpl.java      | 48 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
index d3ae06169..642b98098 100644
--- a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
@@ -53,7 +53,7 @@ public class DeductionAmountPO {
      * 人员类型
      */
     @ElogTransform(name = "人员类型")
-    private Byte employeeType;
+    private Integer employeeType;
 
     /**
      * 工号
@@ -71,24 +71,24 @@ public class DeductionAmountPO {
      * 证件类型
      */
     @ElogTransform(name = "证件类型")
-    private Byte cardType;
+    private Integer cardType;
 
     /**
      * 报送状态
      */
     @ElogTransform(name = "报送状态")
-    private Byte declareStatus;
+    private Integer declareStatus;
 
     /**
      * 是否扣除
      */
     @ElogTransform(name = "是否扣除")
-    private Byte deductFlag;
+    private Integer deductFlag;
     /**
      * 是否成功报送过
      */
     @ElogTransform(name = "是否成功报送过")
-    private Byte successfullyDeclared;
+    private Integer successfullyDeclared;
 
 
     /**
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index e501287a7..7fd9c25bb 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -3,6 +3,7 @@ package com.engine.salary.service.impl;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
 import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
@@ -15,8 +16,10 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.valid.ValidUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.math.NumberUtils;
 import weaver.hrm.User;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -86,27 +89,28 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
         List<Long> employeeDeclareIds = param.getEmployeeDeclareIds();
         List<EmployeeDeclarePO> employeeDeclarePOS = getEmployeeDeclareMapper().listSome(EmployeeDeclarePO.builder().ids(employeeDeclareIds).build());
 
-//        employeeDeclarePOS.stream()
-//                .filter(employeeDeclarePO -> !oldIds.contains(employeeDeclarePO.getEmployeeId()))
-//                .map(employeeDeclarePO -> {
-//                    DeductionAmountPO.builder()
-//                            .id(employeeDeclarePO.getEmployeeId())
-//                            .taxAgentId(employeeDeclarePO.getEmployeeId())
-//                            .year(param.getYear())
-//                            .employeeId(employeeDeclarePO.getEmployeeId())
-//                            .employeeName(employeeDeclarePO.getEmployeeName())
-//                            .employeeType(employeeDeclarePO.getEmployeeId())
-//                            .jobNum(employeeDeclarePO.getEmployeeId())
-//                            .cardNum(employeeDeclarePO.getEmployeeId())
-//                            .cardType(employeeDeclarePO.getEmployeeId())
-//                            .declareStatus(employeeDeclarePO.getEmployeeId())
-//                            .deductFlag(employeeDeclarePO.getEmployeeId())
-//                            .successfullyDeclared(employeeDeclarePO.getEmployeeId())
-//                            .creator(employeeId)
-//                            .createTime(now)
-//                            .updateTime(now)
-//                            .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
-//                            .deleteType(NumberUtils.INTEGER_ZERO)
-//                });
+        Date now = new Date();
+        employeeDeclarePOS.stream()
+                .filter(employeeDeclarePO -> !oldIds.contains(employeeDeclarePO.getEmployeeId()))
+                .map(employeeDeclarePO -> {
+                    DeductionAmountPO.builder()
+                            .id(employeeDeclarePO.getEmployeeId())
+                            .taxAgentId(employeeDeclarePO.getEmployeeId())
+                            .year(param.getYear())
+                            .employeeId(employeeDeclarePO.getEmployeeId())
+                            .employeeName(employeeDeclarePO.getEmployeeName())
+                            .employeeType(employeeDeclarePO.getEmployeeType())
+                            .jobNum(employeeDeclarePO.getJobNum())
+                            .cardNum(employeeDeclarePO.getCardNum())
+                            .cardType(employeeDeclarePO.getCardType())
+                            .declareStatus(0)
+                            .deductFlag(1)
+                            .successfullyDeclared(0)
+                            .creator((long)user.getUID())
+                            .createTime(now)
+                            .updateTime(now)
+                            .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                            .deleteType(NumberUtils.INTEGER_ZERO);
+                });
     }
 }