From 9cee19397d81a8bba424f746977b8dec42e633d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 6 Mar 2025 17:35:25 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryAcctResultServiceImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 67e873658..75c1f0fc5 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -193,6 +193,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
     private VariableItemService getVariableItemService(User user) {
         return ServiceUtil.getService(VariableItemServiceImpl.class, user);
     }
+
     private SalaryApprovalRuleService getSalaryApprovalRuleService(User user) {
         return ServiceUtil.getService(SalaryApprovalRuleServiceImpl.class, user);
     }
@@ -918,7 +919,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             getSalaryAcctProgressService(user).finish(SalaryCacheKey.ACCT_PROGRESS + calculateParam.getSalaryAcctRecordId(), true);
 
             //更新薪资核算记录最后操作日期
-            getSalaryAcctRecordService(user).updateDate(salaryAcctRecordPO.getId(),new Date());
+            getSalaryAcctRecordService(user).updateDate(salaryAcctRecordPO.getId(), new Date());
 
             stopWatch.stop();
             log.info(stopWatch.prettyPrint());
@@ -926,6 +927,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             // 记录日志
             // 查询操作日志的targetName
             String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(calculateParam.getSalaryAcctRecordId());
+            Collection<Long> ids = calculateParam.getIds();
+            if (CollectionUtils.isNotEmpty(ids)) {
+                targetName += ids;
+            }
             LoggerContext<SalaryCheckResultPO> loggerContext = new LoggerContext<>();
             loggerContext.setUser(user);
             loggerContext.setTargetId(String.valueOf(calculateParam.getSalaryAcctRecordId()));

From 894b9cd1fc97da00c477cda53f312f0085d8796b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 10 Mar 2025 15:31:33 +0800
Subject: [PATCH 02/20] =?UTF-8?q?1=E3=80=81=E6=89=A3=E9=99=A4=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=202=E3=80=81=E6=89=A3=E9=99=A4?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/web/DeductionAmountController.java |  15 +
 .../param/DeductionAmountAddParam.java        |  45 ++
 .../param/DeductionAmountConfirmParam.java    |  31 ++
 .../DeductionAmountOnlineQueryParam.java      |  31 ++
 .../param/DeductionAmountQueryParam.java      |  31 ++
 .../deductionamount/po/DeductionAmountPO.java | 128 +++++
 .../DeductionAmountMapper.java                |  74 +++
 .../deductionamount/DeductionAmountMapper.xml | 345 ++++++++++++++
 .../tax/client/DeductionAmountClient.java     |  93 ++++
 .../remote/tax/client/EmployeeClient.java     |   4 +-
 .../ConfirmPreDeductRequest.java              |  95 ++++
 .../QueryDeductionAmountRequest.java          |  64 +++
 .../service/DeductionAmountService.java       |  19 +
 .../impl/DeductionAmountServiceImpl.java      | 112 +++++
 .../salary/web/DeductionAmountController.java | 442 ++++++++++++++++++
 .../wrapper/DeductionAmountWrapper.java       |  34 ++
 test/ParseTaxApi.java                         |   4 +-
 17 files changed, 1563 insertions(+), 4 deletions(-)
 create mode 100644 src/com/api/salary/web/DeductionAmountController.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountAddParam.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountConfirmParam.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountOnlineQueryParam.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountQueryParam.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
 create mode 100644 src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.java
 create mode 100644 src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
 create mode 100644 src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
 create mode 100644 src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
 create mode 100644 src/com/engine/salary/remote/tax/request/deductionAmount/QueryDeductionAmountRequest.java
 create mode 100644 src/com/engine/salary/service/DeductionAmountService.java
 create mode 100644 src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
 create mode 100644 src/com/engine/salary/web/DeductionAmountController.java
 create mode 100644 src/com/engine/salary/wrapper/DeductionAmountWrapper.java

diff --git a/src/com/api/salary/web/DeductionAmountController.java b/src/com/api/salary/web/DeductionAmountController.java
new file mode 100644
index 000000000..b18635031
--- /dev/null
+++ b/src/com/api/salary/web/DeductionAmountController.java
@@ -0,0 +1,15 @@
+package com.api.salary.web;
+
+import javax.ws.rs.Path;
+
+/**
+ * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Path("/bs/hrmsalary/deductionAmount")
+public class DeductionAmountController extends com.engine.salary.web.DeductionAmountController {
+}
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountAddParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountAddParam.java
new file mode 100644
index 000000000..0deb8966f
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountAddParam.java
@@ -0,0 +1,45 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountAddParam {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 个税扣缴义务人id
+     */
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    /**
+     * 税款所属年度
+     */
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
+
+    /**
+     * 报送人员ids
+     */
+    private List<Long> employeeDeclareIds;
+}
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountConfirmParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountConfirmParam.java
new file mode 100644
index 000000000..e5fe93593
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountConfirmParam.java
@@ -0,0 +1,31 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountConfirmParam {
+
+    // 个税扣缴义务人id
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    // 税款所属年度
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
+
+}
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountOnlineQueryParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountOnlineQueryParam.java
new file mode 100644
index 000000000..cd5c8f2ee
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountOnlineQueryParam.java
@@ -0,0 +1,31 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountOnlineQueryParam {
+
+    // 个税扣缴义务人id
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    // 税款所属年度
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
+
+}
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountQueryParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountQueryParam.java
new file mode 100644
index 000000000..d6b87fb23
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountQueryParam.java
@@ -0,0 +1,31 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountQueryParam {
+
+    // 个税扣缴义务人id
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    // 税款所属年度
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
+
+}
diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
new file mode 100644
index 000000000..d3ae06169
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
@@ -0,0 +1,128 @@
+package com.engine.salary.entity.deductionamount.po;
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 人员报送记录
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_deduction_amount
+public class DeductionAmountPO {
+
+    /**
+     * ID
+     */
+    @ElogTransform(name = "ID")
+    private Long id;
+
+    /**
+     * 个税扣缴义务人ID
+     */
+    @ElogTransform(name = "个税扣缴义务人ID")
+    private Long taxAgentId;
+
+
+    /**
+     * 税款所属年度
+     */
+    @ElogTransform(name = "税款所属年度")
+    private String year;
+    /**
+     * 人员id
+     */
+    @ElogTransform(name = "人员id")
+    private Long employeeId;
+
+    /**
+     * 姓名
+     */
+    @ElogTransform(name = "姓名")
+    private String employeeName;
+
+    /**
+     * 人员类型
+     */
+    @ElogTransform(name = "人员类型")
+    private Byte employeeType;
+
+    /**
+     * 工号
+     */
+    @ElogTransform(name = "工号")
+    private String jobNum;
+
+    /**
+     * 证件号码
+     */
+    @ElogTransform(name = "证件号码")
+    private String cardNum;
+
+    /**
+     * 证件类型
+     */
+    @ElogTransform(name = "证件类型")
+    private Byte cardType;
+
+    /**
+     * 报送状态
+     */
+    @ElogTransform(name = "报送状态")
+    private Byte declareStatus;
+
+    /**
+     * 是否扣除
+     */
+    @ElogTransform(name = "是否扣除")
+    private Byte deductFlag;
+    /**
+     * 是否成功报送过
+     */
+    @ElogTransform(name = "是否成功报送过")
+    private Byte successfullyDeclared;
+
+
+    /**
+     * 创建时间
+     */
+    @ElogTransform(name = "创建时间")
+    private Date createTime;
+
+
+    /**
+     * 修改时间
+     */
+    @ElogTransform(name = "修改时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ElogTransform(name = "创建人id")
+    private Long creator;
+
+    /**
+     * 是否删除
+     */
+    @ElogTransform(name = "是否删除")
+    private Integer deleteType;
+
+    /**
+     * 租户KEY
+     */
+    @ElogTransform(name = "租户KEY")
+    private String tenantKey;
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.java b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.java
new file mode 100644
index 000000000..352d00a2e
--- /dev/null
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.java
@@ -0,0 +1,74 @@
+package com.engine.salary.mapper.deductionamount;
+
+import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface DeductionAmountMapper {
+
+    /**
+     * 查询所有记录
+     *
+     * @return 返回集合，没有返回空List
+     */
+    List<DeductionAmountPO> listAll();
+
+    /**
+     * 条件查询
+     *
+     * @return 返回集合，没有返回空List
+     */
+    List<DeductionAmountPO> listSome(DeductionAmountPO deductionAmount);
+
+
+    /**
+     * 根据主键查询
+     *
+     * @param id 主键
+     * @return 返回记录，没有返回null
+     */
+    DeductionAmountPO getById(Long id);
+
+    /**
+     * 新增，忽略null字段
+     *
+     * @param deductionAmount 新增的记录
+     * @return 返回影响行数
+     */
+    int insertIgnoreNull(DeductionAmountPO deductionAmount);
+
+
+    /**
+     * 修改，修改所有字段
+     *
+     * @param deductionAmount 修改的记录
+     * @return 返回影响行数
+     */
+    int update(DeductionAmountPO deductionAmount);
+
+    /**
+     * 修改，忽略null字段
+     *
+     * @param deductionAmount 修改的记录
+     * @return 返回影响行数
+     */
+    int updateIgnoreNull(DeductionAmountPO deductionAmount);
+
+    /**
+     * 删除记录
+     *
+     * @param deductionAmount 待删除的记录
+     * @return 返回影响行数
+     */
+    int delete(DeductionAmountPO deductionAmount);
+
+    /**
+     * 批量删除记录
+     *
+     * @param ids 主键id集合
+     */
+    void deleteByIds(@Param("ids") Collection<Long> ids);
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
new file mode 100644
index 000000000..f41492135
--- /dev/null
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.engine.salary.mapper.deductionamount.DeductionAmountMapper">
+    <resultMap id="BaseResultMap" type="com.engine.salary.entity.deductionamount.po.DeductionAmountPO">
+        <result column="card_num" property="cardNum"/>
+        <result column="card_type" property="cardType"/>
+        <result column="create_time" property="createTime"/>
+        <result column="creator" property="creator"/>
+        <result column="declare_status" property="declareStatus"/>
+        <result column="deduct_flag" property="deductFlag"/>
+        <result column="delete_type" property="deleteType"/>
+        <result column="employee_id" property="employeeId"/>
+        <result column="employee_name" property="employeeName"/>
+        <result column="employee_type" property="employeeType"/>
+        <result column="id" property="id"/>
+        <result column="job_num" property="jobNum"/>
+        <result column="successfully_declared" property="successfullyDeclared"/>
+        <result column="tax_agent_id" property="taxAgentId"/>
+        <result column="tenant_key" property="tenantKey"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="year" property="year"/>
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        t
+        .
+        card_num
+        , t.card_type
+        , t.create_time
+        , t.creator
+        , t.declare_status
+        , t.deduct_flag
+        , t.delete_type
+        , t.employee_id
+        , t.employee_name
+        , t.employee_type
+        , t.id
+        , t.job_num
+        , t.successfully_declared
+        , t.tax_agent_id
+        , t.tenant_key
+        , t.update_time
+        , t.year
+    </sql>
+
+    <!-- 查询全部 -->
+    <select id="listAll" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount t
+        WHERE delete_type = 0
+    </select>
+
+    <!-- 根据主键获取单条记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="Long">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount t
+        WHERE id = #{id} AND delete_type = 0
+    </select>
+
+    <!-- 条件查询 -->
+    <select id="listSome" resultMap="BaseResultMap"
+            parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountPO">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount t
+        WHERE delete_type = 0
+        <if test="cardNum != null">
+            AND card_num = #{cardNum}
+        </if>
+        <if test="cardType != null">
+            AND card_type = #{cardType}
+        </if>
+        <if test="createTime != null">
+            AND create_time = #{createTime}
+        </if>
+        <if test="creator != null">
+            AND creator = #{creator}
+        </if>
+        <if test="declareStatus != null">
+            AND declare_status = #{declareStatus}
+        </if>
+        <if test="deductFlag != null">
+            AND deduct_flag = #{deductFlag}
+        </if>
+        <if test="deleteType != null">
+            AND delete_type = #{deleteType}
+        </if>
+        <if test="employeeId != null">
+            AND employee_id = #{employeeId}
+        </if>
+        <if test="employeeName != null">
+            AND employee_name = #{employeeName}
+        </if>
+        <if test="employeeType != null">
+            AND employee_type = #{employeeType}
+        </if>
+        <if test="id != null">
+            AND id = #{id}
+        </if>
+        <if test="jobNum != null">
+            AND job_num = #{jobNum}
+        </if>
+        <if test="successfullyDeclared != null">
+            AND successfully_declared = #{successfullyDeclared}
+        </if>
+        <if test="taxAgentId != null">
+            AND tax_agent_id = #{taxAgentId}
+        </if>
+        <if test="tenantKey != null">
+            AND tenant_key = #{tenantKey}
+        </if>
+        <if test="updateTime != null">
+            AND update_time = #{updateTime}
+        </if>
+        <if test="year != null">
+            AND year = #{year}
+        </if>
+        <if test="ids != null and ids.size()>0">
+            AND id IN
+            <foreach collection="ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY id DESC
+    </select>
+
+
+    <!-- 插入不为NULL的字段 -->
+    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountPO">
+        INSERT INTO hrsa_deduction_amount
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+
+            <if test="cardNum != null">
+                card_num,
+            </if>
+            <if test="cardType != null">
+                card_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="declareStatus != null">
+                declare_status,
+            </if>
+            <if test="deductFlag != null">
+                deduct_flag,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="employeeId != null">
+                employee_id,
+            </if>
+            <if test="employeeName != null">
+                employee_name,
+            </if>
+            <if test="employeeType != null">
+                employee_type,
+            </if>
+            <if test="id != null">
+                id,
+            </if>
+            <if test="jobNum != null">
+                job_num,
+            </if>
+            <if test="successfullyDeclared != null">
+                successfully_declared,
+            </if>
+            <if test="taxAgentId != null">
+                tax_agent_id,
+            </if>
+            <if test="tenantKey != null">
+                tenant_key,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="year != null">
+                year,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="cardNum != null">
+                #{cardNum},
+            </if>
+            <if test="cardType != null">
+                #{cardType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="declareStatus != null">
+                #{declareStatus},
+            </if>
+            <if test="deductFlag != null">
+                #{deductFlag},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="employeeId != null">
+                #{employeeId},
+            </if>
+            <if test="employeeName != null">
+                #{employeeName},
+            </if>
+            <if test="employeeType != null">
+                #{employeeType},
+            </if>
+            <if test="id != null">
+                #{id},
+            </if>
+            <if test="jobNum != null">
+                #{jobNum},
+            </if>
+            <if test="successfullyDeclared != null">
+                #{successfullyDeclared},
+            </if>
+            <if test="taxAgentId != null">
+                #{taxAgentId},
+            </if>
+            <if test="tenantKey != null">
+                #{tenantKey},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="year != null">
+                #{year},
+            </if>
+        </trim>
+    </insert>
+
+
+    <!-- 更新,更新全部字段 -->
+    <update id="update" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountPO">
+        UPDATE hrsa_deduction_amount
+        <set>
+            card_num=#{cardNum},
+            card_type=#{cardType},
+            create_time=#{createTime},
+            creator=#{creator},
+            declare_status=#{declareStatus},
+            deduct_flag=#{deductFlag},
+            delete_type=#{deleteType},
+            employee_id=#{employeeId},
+            employee_name=#{employeeName},
+            employee_type=#{employeeType},
+            job_num=#{jobNum},
+            successfully_declared=#{successfullyDeclared},
+            tax_agent_id=#{taxAgentId},
+            tenant_key=#{tenantKey},
+            update_time=#{updateTime},
+            year=#{year},
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+
+    <!-- 更新不为NULL的字段 -->
+    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountPO">
+        UPDATE hrsa_deduction_amount
+        <set>
+            <if test="cardNum != null">
+                card_num=#{cardNum},
+            </if>
+            <if test="cardType != null">
+                card_type=#{cardType},
+            </if>
+            <if test="createTime != null">
+                create_time=#{createTime},
+            </if>
+            <if test="creator != null">
+                creator=#{creator},
+            </if>
+            <if test="declareStatus != null">
+                declare_status=#{declareStatus},
+            </if>
+            <if test="deductFlag != null">
+                deduct_flag=#{deductFlag},
+            </if>
+            <if test="deleteType != null">
+                delete_type=#{deleteType},
+            </if>
+            <if test="employeeId != null">
+                employee_id=#{employeeId},
+            </if>
+            <if test="employeeName != null">
+                employee_name=#{employeeName},
+            </if>
+            <if test="employeeType != null">
+                employee_type=#{employeeType},
+            </if>
+            <if test="jobNum != null">
+                job_num=#{jobNum},
+            </if>
+            <if test="successfullyDeclared != null">
+                successfully_declared=#{successfullyDeclared},
+            </if>
+            <if test="taxAgentId != null">
+                tax_agent_id=#{taxAgentId},
+            </if>
+            <if test="tenantKey != null">
+                tenant_key=#{tenantKey},
+            </if>
+            <if test="updateTime != null">
+                update_time=#{updateTime},
+            </if>
+            <if test="year != null">
+                year=#{year},
+            </if>
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+
+    <!-- 根据主键删除记录 -->
+    <delete id="delete">
+        UPDATE hrsa_deduction_amount
+        SET delete_type=1
+        WHERE id = #{id}
+          AND delete_type = 0
+    </delete>
+
+    <delete id="deleteByIds">
+        UPDATE hrsa_deduction_amount
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
new file mode 100644
index 000000000..bb9b92e9c
--- /dev/null
+++ b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
@@ -0,0 +1,93 @@
+package com.engine.salary.remote.tax.client;
+
+import com.engine.salary.enums.taxagent.TaxAgentTaxReturnPasswordTypeEnum;
+import com.engine.salary.remote.tax.request.deductionAmount.ConfirmPreDeductRequest;
+import com.engine.salary.remote.tax.request.deductionAmount.QueryDeductionAmountRequest;
+import com.engine.salary.util.HttpUtil;
+import com.engine.salary.util.JsonUtil;
+import com.engine.salary.util.SingnatureData;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 申报扣减客户端
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Slf4j
+public class DeductionAmountClient extends TaxBaseClient {
+
+    public DeductionAmountClient(Long taxAgentId) {
+        super(taxAgentId);
+    }
+
+    public String query(String taxYear) {
+
+        String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/queryPreDeduct";
+        QueryDeductionAmountRequest queryDeductionAmountRequest = new QueryDeductionAmountRequest();
+        queryDeductionAmountRequest.setNsrsbh(returnPO.getTaxCode());
+        queryDeductionAmountRequest.setBizNo(UUID.randomUUID().toString().replace("-", ""));
+        queryDeductionAmountRequest.setQymc(returnPO.getTaxAgentName());
+        queryDeductionAmountRequest.setDjxhid(StringUtils.isNotEmpty(returnPO.getTaxRegistrationNumber()) ? returnPO.getTaxRegistrationNumber() : null);
+        queryDeductionAmountRequest.setAreaid(returnPO.getAreaCode());
+        queryDeductionAmountRequest.setBmbh(StringUtils.isNotEmpty(returnPO.getDepartmentCode()) ? returnPO.getDepartmentCode() : null);
+        boolean realNamePwd = TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(returnPO.getPasswordType());
+        queryDeductionAmountRequest.setSbmm(realNamePwd ? null : returnPO.getPwd());
+        queryDeductionAmountRequest.setJmsbmm("1");
+        queryDeductionAmountRequest.setSmzh(realNamePwd ? returnPO.getRealAccount() : null);
+        queryDeductionAmountRequest.setSmmm(realNamePwd ? returnPO.getPwd() : null);
+        queryDeductionAmountRequest.setJmsmmm("1");
+        queryDeductionAmountRequest.setMmlx("" + returnPO.getPasswordType());
+        queryDeductionAmountRequest.setSkssnd(taxYear);
+
+        String reqJson = JsonUtil.toJsonString(queryDeductionAmountRequest);
+        log.info("queryDeductionAmountRequest params --- \n{}\n", reqJson);
+        Map<String, String> params = new HashMap<>(1);
+        Map<String, String> header = SingnatureData.initHeader(params, apiConfig.getAppKey(), apiConfig.getAppSecret());
+
+        //  开始请求
+        String res = HttpUtil.doPost(url, header, reqJson, HttpUtil.JSON_TYPE);
+        log.info("queryDeductionAmountRequest res --- {}", res);
+        return res;
+    }
+
+
+
+    public String confirmPreDeduct(String year) {
+
+        String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/queryPreDeduct";
+        ConfirmPreDeductRequest request = new ConfirmPreDeductRequest();
+        request.setNsrsbh(returnPO.getTaxCode());
+        request.setBizNo(UUID.randomUUID().toString().replace("-", ""));
+        request.setQymc(returnPO.getTaxAgentName());
+        request.setDjxhid(StringUtils.isNotEmpty(returnPO.getTaxRegistrationNumber()) ? returnPO.getTaxRegistrationNumber() : null);
+        request.setAreaid(returnPO.getAreaCode());
+        request.setBmbh(StringUtils.isNotEmpty(returnPO.getDepartmentCode()) ? returnPO.getDepartmentCode() : null);
+        boolean realNamePwd = TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(returnPO.getPasswordType());
+        request.setSbmm(realNamePwd ? null : returnPO.getPwd());
+        request.setJmsbmm("1");
+        request.setSmzh(realNamePwd ? returnPO.getRealAccount() : null);
+        request.setSmmm(realNamePwd ? returnPO.getPwd() : null);
+        request.setJmsmmm("1");
+        request.setMmlx("" + returnPO.getPasswordType());
+        request.setSkssnd(year);
+        request.setKczglb(null);
+
+        String reqJson = JsonUtil.toJsonString(request);
+        log.info("queryDeductionAmountRequest params --- \n{}\n", reqJson);
+        Map<String, String> params = new HashMap<>(1);
+        Map<String, String> header = SingnatureData.initHeader(params, apiConfig.getAppKey(), apiConfig.getAppSecret());
+
+        //  开始请求
+        String res = HttpUtil.doPost(url, header, reqJson, HttpUtil.JSON_TYPE);
+        log.info("queryDeductionAmountRequest res --- {}", res);
+        return res;
+    }
+}
diff --git a/src/com/engine/salary/remote/tax/client/EmployeeClient.java b/src/com/engine/salary/remote/tax/client/EmployeeClient.java
index 480d00e53..5a246b398 100644
--- a/src/com/engine/salary/remote/tax/client/EmployeeClient.java
+++ b/src/com/engine/salary/remote/tax/client/EmployeeClient.java
@@ -39,10 +39,10 @@ public class EmployeeClient extends TaxBaseClient {
         mergedEmployeeArchivesRequest.setBmbh(StringUtils.isNotEmpty(returnPO.getDepartmentCode()) ? returnPO.getDepartmentCode() : null);
         boolean realNamePwd = TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(returnPO.getPasswordType());
         mergedEmployeeArchivesRequest.setSbmm(realNamePwd ? null : returnPO.getPwd());
-        mergedEmployeeArchivesRequest.setJmsbmm("0");
+        mergedEmployeeArchivesRequest.setJmsbmm("1");
         mergedEmployeeArchivesRequest.setSmzh(realNamePwd ? returnPO.getRealAccount() : null);
         mergedEmployeeArchivesRequest.setSmmm(realNamePwd ? returnPO.getPwd() : null);
-        mergedEmployeeArchivesRequest.setJmsmmm("0");
+        mergedEmployeeArchivesRequest.setJmsmmm("1");
         mergedEmployeeArchivesRequest.setMmlx("" + returnPO.getPasswordType());
 
 
diff --git a/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java b/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
new file mode 100644
index 000000000..035c90543
--- /dev/null
+++ b/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
@@ -0,0 +1,95 @@
+package com.engine.salary.remote.tax.request.deductionAmount;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ConfirmPreDeductRequest {
+    /**
+     * 外部业务编号    必填：是    外部业务编号，唯一，幂等需要，最长64位,建议使用UUID
+     */
+    private String bizNo;
+    /**
+     * 企业名称    必填：是    代报企业全称
+     */
+    private String qymc;
+    /**
+     * 密码类型    必填：否    默认不传则设置为0， 0表示申报密码；2表示实名账号实名密码
+     */
+    private String mmlx;
+    /**
+     * 实名账号    必填：选择必填    当mmlx=2时，必填
+     */
+    private String smzh;
+    /**
+     * 实名密码    必填：选择必填    当mmlx=2时，必填
+     */
+    private String smmm;
+    /**
+     * 加密实名密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密  参考3.4代报、实名密码加密说明
+     */
+    private String jmsmmm;
+    /**
+     * 登记序号    必填：否    存在多个登记序号时，需要指定传入一个.例：10117440105249764755
+     */
+    private String djxhid;
+    /**
+     * 税号    必填：是    扣缴单位纳税人识别号
+     */
+    private String nsrsbh;
+    /**
+     * 地区编号    必填：是    6位行政区划代码,精确到市级，例如：440100,参考省市区编码
+     */
+    private String areaid;
+    /**
+     * 部门编号    必填：否    分部门代报时必传
+     */
+    private String bmbh;
+    /**
+     * 部门名称    必填：否
+     */
+    private String bmmc;
+    /**
+     * 申报密码    必填：条件必填    当mmlx=0时，必填
+     */
+    private String sbmm;
+    /**
+     * 加密申报密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密
+     */
+    private String jmsbmm;
+    /**
+     * 税款所属年度    必填：必填    yyyy
+     */
+    private String skssnd;
+
+    /**
+     * 扣除资格列表
+     */
+    private List<kczg> kczglb;
+
+
+    public static class kczg {
+        /**
+         * 姓名
+         */
+        private String xm;
+        /**
+         * 证件类型        见证件类型字典
+         */
+        private String zzlx;
+        /**
+         * 证件号码        证件号码
+         */
+        private String zzhm;
+        /**
+         * 国籍
+         */
+        private String gj;
+        /**
+         * 扣除标识        是/否
+         */
+        private String kcbs;
+    }
+
+}
diff --git a/src/com/engine/salary/remote/tax/request/deductionAmount/QueryDeductionAmountRequest.java b/src/com/engine/salary/remote/tax/request/deductionAmount/QueryDeductionAmountRequest.java
new file mode 100644
index 000000000..1aaa0a3a1
--- /dev/null
+++ b/src/com/engine/salary/remote/tax/request/deductionAmount/QueryDeductionAmountRequest.java
@@ -0,0 +1,64 @@
+package com.engine.salary.remote.tax.request.deductionAmount;
+
+import lombok.Data;
+
+@Data
+public class QueryDeductionAmountRequest {
+    /**
+     * 外部业务编号    必填：是    外部业务编号，唯一，幂等需要，最长64位,建议使用UUID
+     */
+    private String bizNo;
+    /**
+     * 企业名称    必填：是    代报企业全称
+     */
+    private String qymc;
+    /**
+     * 密码类型    必填：否    默认不传则设置为0， 0表示申报密码；2表示实名账号实名密码
+     */
+    private String mmlx;
+    /**
+     * 实名账号    必填：选择必填    当mmlx=2时，必填
+     */
+    private String smzh;
+    /**
+     * 实名密码    必填：选择必填    当mmlx=2时，必填
+     */
+    private String smmm;
+    /**
+     * 加密实名密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密  参考3.4代报、实名密码加密说明
+     */
+    private String jmsmmm;
+    /**
+     * 登记序号    必填：否    存在多个登记序号时，需要指定传入一个.例：10117440105249764755
+     */
+    private String djxhid;
+    /**
+     * 税号    必填：是    扣缴单位纳税人识别号
+     */
+    private String nsrsbh;
+    /**
+     * 地区编号    必填：是    6位行政区划代码,精确到市级，例如：440100,参考省市区编码
+     */
+    private String areaid;
+    /**
+     * 部门编号    必填：否    分部门代报时必传
+     */
+    private String bmbh;
+    /**
+     * 部门名称    必填：否
+     */
+    private String bmmc;
+    /**
+     * 申报密码    必填：条件必填    当mmlx=0时，必填
+     */
+    private String sbmm;
+    /**
+     * 加密申报密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密
+     */
+    private String jmsbmm;
+    /**
+     * 税款所属年度    必填：必填    yyyy
+     */
+    private String skssnd;
+
+}
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
new file mode 100644
index 000000000..a72534724
--- /dev/null
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -0,0 +1,19 @@
+package com.engine.salary.service;
+
+import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+
+/**
+ * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public interface DeductionAmountService {
+
+    Object query(DeductionAmountOnlineQueryParam queryParam);
+
+    void add(DeductionAmountAddParam param);
+}
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
new file mode 100644
index 000000000..e501287a7
--- /dev/null
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -0,0 +1,112 @@
+package com.engine.salary.service.impl;
+
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.core.impl.Service;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
+import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
+import com.engine.salary.mapper.deductionamount.DeductionAmountMapper;
+import com.engine.salary.mapper.employeedeclare.EmployeeDeclareMapper;
+import com.engine.salary.remote.tax.client.DeductionAmountClient;
+import com.engine.salary.service.*;
+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 weaver.hrm.User;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Slf4j
+public class DeductionAmountServiceImpl extends Service implements DeductionAmountService {
+
+    private DeductionAmountMapper getDeductionAmountMapper() {
+        return MapperProxyFactory.getProxy(DeductionAmountMapper.class);
+    }
+
+    private EmployeeDeclareMapper getEmployeeDeclareMapper() {
+        return MapperProxyFactory.getProxy(EmployeeDeclareMapper.class);
+    }
+
+    private TaxAgentService getTaxAgentService(User user) {
+        return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
+    }
+
+    private SalaryEmployeeService getSalaryEmployeeService(User user) {
+        return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
+    }
+
+    private SalaryArchiveService getSalaryArchiveService(User user) {
+        return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user);
+    }
+
+    private TaxDeclarationApiConfigService getTaxDeclarationApiConfigService(User user) {
+        return ServiceUtil.getService(TaxDeclarationApiConfigServiceImpl.class, user);
+    }
+
+    private TaxAgentTaxReturnService getTaxAgentTaxReturnService(User user) {
+        return ServiceUtil.getService(TaxAgentTaxReturnServiceImpl.class, user);
+    }
+
+    private EmployeeDeclareRecordService getEmployeeDeclareRecordService(User user) {
+        return ServiceUtil.getService(EmployeeDeclareRecordServiceImpl.class, user);
+    }
+
+    private TaxDeclarationApiBillingService getTaxDeclarationApiBillingService(User user) {
+        return ServiceUtil.getService(TaxDeclarationApiBillingServiceImpl.class, user);
+    }
+
+    @Override
+    public Object query(DeductionAmountOnlineQueryParam queryParam) {
+        Long taxAgentId = queryParam.getTaxAgentId();
+        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
+        return deductionAmountClient.query(queryParam.getYear());
+    }
+
+    @Override
+    public void add(DeductionAmountAddParam param) {
+        ValidUtil.doValidator(param);
+
+        //已存在
+        List<DeductionAmountPO> deductionAmountPOS = getDeductionAmountMapper().listSome(DeductionAmountPO.builder().taxAgentId(param.getTaxAgentId()).year(param.getYear()).build());
+        List<Long> oldIds = SalaryEntityUtil.properties(deductionAmountPOS, DeductionAmountPO::getEmployeeId, Collectors.toList());
+
+        //本次新增
+        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)
+//                });
+    }
+}
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
new file mode 100644
index 000000000..e9ad983fc
--- /dev/null
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -0,0 +1,442 @@
+package com.engine.salary.web;
+
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.util.ResponseResult;
+import com.engine.salary.wrapper.DeductionAmountWrapper;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import lombok.extern.slf4j.Slf4j;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Slf4j
+public class DeductionAmountController {
+
+    private DeductionAmountWrapper getDeductionAmountWrapper(User user) {
+        return ServiceUtil.getService(DeductionAmountWrapper.class, user);
+    }
+
+    @POST
+    @Path("/add")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String add(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountAddParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountAddParam, Object>(user).run(getDeductionAmountWrapper(user)::add, param);
+    }
+
+    @POST
+    @Path("/query")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String queryPreDeduct(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountOnlineQueryParam queryParam) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountOnlineQueryParam, Object>(user).run(getDeductionAmountWrapper(user)::query, queryParam);
+    }
+
+//    @POST
+//    @Path("/confirmPreDeduct")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String queryPreDeduct(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountConfirmParam param) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
+//    }
+
+//    /**
+//     * 人员报送-个税扣缴义务人列表
+//     *
+//     * @param param 查询条件
+//     * @return
+//     */
+//    @POST
+//    @Path("/taxAgentDeclareList")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String taxAgentDeclareList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxAgentDeclareListQueryParam param) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<TaxAgentDeclareListQueryParam, PageInfo<TaxAgentDeclareListDTO>>(user).run(getEmployeeDeclareWrapper(user)::taxAgentDeclareList, param);
+//    }
+//
+//    /**
+//     * 人员报送-全部人员列表
+//     *
+//     * @param queryParam 查询条件
+//     * @return
+//     */
+//    @POST
+//    @Path("/list")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list, queryParam);
+//    }
+//
+//    /**
+//     * 人员报送-本月新增人员列表
+//     *
+//     * @param queryParam 查询条件
+//     * @return
+//     */
+//    @POST
+//    @Path("/list4Add")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String list4Add(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareAddListQueryParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareAddListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list4Add, queryParam);
+//    }
+//
+//    /**
+//     * 人员报送-本月信息变动列表
+//     *
+//     * @param queryParam 查询条件
+//     * @return
+//     */
+//    @POST
+//    @Path("/list4Update")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String list4Update(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list4Update, queryParam);
+//    }
+//
+//    /**
+//     * 人员报送-本月报送失败人员列表
+//     *
+//     * @param queryParam 查询条件
+//     * @return
+//     */
+//    @POST
+//    @Path("/list4Fail")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String list4Fail(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareFailListQueryParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareFailListQueryParam, PageInfo<EmployeeDeclareFailListDTO>>(user).run(getEmployeeDeclareWrapper(user)::list4Fail, queryParam);
+//    }
+//
+//    /**
+//     * 人员报送-获取新建或编辑的表单
+//     *
+//     * @param id 报送人员列表的主键id
+//     * @return
+//     */
+//    @GET
+//    @Path("/getForm")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String getForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<Long, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::getForm, id);
+//    }
+//
+////    @GetMapping("/getBatchUpdateForm")
+////    @ApiOperation("人员报送-获取批量编辑的表单")
+////    @Produces(MediaType.APPLICATION_JSON)
+////    public WeaResult<WeaForm> getBatchUpdateForm() {
+////        WeaForm weaForm = employeeDeclareWrapper.getBatchUpdateForm();
+////        return WeaResult.success(weaForm);
+////    }
+////
+////    @GetMapping("/getSearchCondition")
+////    @ApiOperation("人员报送-获取高级搜索条件")
+////    @Produces(MediaType.APPLICATION_JSON)
+////    public WeaResult<WeaSearchCondition> getSearchCondition() {
+////        WeaSearchCondition searchCondition = employeeDeclareWrapper.getSearchCondition();
+////        return WeaResult.success(searchCondition);
+////    }
+//
+//    /**
+//     * 人员报送-新增人员/编辑人员保存
+//     *
+//     * @param saveParam 保存参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/save")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String save(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareSaveParam saveParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareSaveParam, PageInfo<EmployeeDeclareFailListDTO>>(user).run(getEmployeeDeclareWrapper(user)::save, saveParam);
+//    }
+//
+////    /**
+////     * 人员报送-批量编辑
+////     *
+////     * @param batchUpdateParam 批量编辑参数
+////     * @return
+////     */
+////    @Path("/batchUpdate")
+////    @ApiOperation("人员报送-批量编辑")
+////    @Produces(MediaType.APPLICATION_JSON)
+////    public WeaResult<Object> batchUpdate(@RequestBody @Validated EmployeeDeclareBatchUpdateParam batchUpdateParam) {
+////        employeeDeclareWrapper.batchUpdate(batchUpdateParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
+////        return WeaResult.success(null);
+////    }
+//
+//    /**
+//     * 人员报送-删除
+//     *
+//     * @param ids 待删除的主键id
+//     * @return
+//     */
+//    @POST
+//    @Path("/delete")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Collection<Long> ids) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<Collection<Long>, String>(user).run(getEmployeeDeclareWrapper(user)::deleteByIds, ids);
+//    }
+//
+//    /**
+//     * 人员报送-刷新数据
+//     *
+//     * @param refreshParam 刷新数据的参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/refresh")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String refresh(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareRefreshParam refreshParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareRefreshParam, String>(user).run(getEmployeeDeclareWrapper(user)::refresh, refreshParam);
+//    }
+//
+//    /**
+//     * 人员报送-获取整体的报送情况
+//     *
+//     * @param employeeDeclareParam 获取整体的报送情况的参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/getDeclareInfo")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String getDeclareInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareParam, EmployeeDeclareInfoDTO>(user).run(getEmployeeDeclareWrapper(user)::getDeclareInfo, employeeDeclareParam);
+//    }
+//
+//    /**
+//     * 人员报送-全部报送
+//     *
+//     * @param employeeDeclareParam 在线报送
+//     * @return
+//     */
+//    @POST
+//    @Path("/declare")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String declare(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareParam, String>(user).run(getEmployeeDeclareWrapper(user)::declare, employeeDeclareParam);
+//    }
+//
+//    /**
+//     * 人员报送-获取报送结果反馈
+//     *
+//     * @param employeeDeclareParam 获取反馈
+//     * @return
+//     */
+//    @POST
+//    @Path("/getDeclareFeedback")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String getDeclareFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareParam, String>(user).run(getEmployeeDeclareWrapper(user)::getDeclareFeedback, employeeDeclareParam);
+//    }
+//
+//
+//    /**
+//     * 人员报送-后端业务逻辑是否已经完成
+//     *
+//     * @param index 进度索引
+//     * @return
+//     */
+//    @GET
+//    @Path("/getRate")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String getRate(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "index") String index) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<String, EmployeeDeclareRateDTO>(user).run(getEmployeeDeclareWrapper(user)::getRate, index);
+//    }
+//
+//    /**
+//     * 人员报送-下载导入模板
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/exportTemplate")
+//    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+//    public Response exportTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
+//
+//        try {
+//            User user = HrmUserVarify.getUser(request, response);
+//            XSSFWorkbook workbook = getEmployeeDeclareWrapper(user).exportTemplate(queryParam);
+//            String fileName = "人员信息采集导入模板-" + LocalDate.now();
+//            try {
+//                fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
+//            } catch (UnsupportedEncodingException e) {
+//                e.printStackTrace();
+//            }
+//
+//            StreamingOutput output = outputStream -> {
+//                workbook.write(outputStream);
+//                outputStream.flush();
+//            };
+//            response.setContentType("application/octet-stream");
+//            return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
+//        } catch (Exception e) {
+//            log.error("人员报送-人员信息采集导入模板异常", e);
+//            throw e;
+//        }
+//    }
+//
+//    /**
+//     * 人员报送-导入预览
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/preview")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String preview(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareImportParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::preview, queryParam);
+//    }
+//
+//    /**
+//     * 人员报送-导入
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/importData")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public String importData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
+//        User user = HrmUserVarify.getUser(request, response);
+//        return new ResponseResult<EmployeeDeclareImportParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::importData, queryParam);
+//    }
+//
+//
+//    /**
+//     * 人员报送-导出全部人员
+//     *
+//     * @param param 导出参数
+//     * @return
+//     */
+//    @POST
+//    @Path("/export")
+//    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+//    public Response export(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam param) {
+//
+//        try {
+//            User user = HrmUserVarify.getUser(request, response);
+//            XSSFWorkbook workbook = getEmployeeDeclareWrapper(user).export(param);
+//            String fileName = "人员信息采集-" + LocalDate.now();
+//            try {
+//                fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
+//            } catch (UnsupportedEncodingException e) {
+//                e.printStackTrace();
+//            }
+//
+//            StreamingOutput output = outputStream -> {
+//                workbook.write(outputStream);
+//                outputStream.flush();
+//            };
+//            response.setContentType("application/octet-stream");
+//            return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
+//        } catch (Exception e) {
+//            log.error("人员报送-导出全部人员异常", e);
+//            throw e;
+//        }
+//    }
+
+//    /**
+//     * 人员报送-导出本月新增人员
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @Path("/export4Add")
+//    @ApiOperation("人员报送-导出本月新增人员")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public WeaResult<Object> export4Add(@RequestBody @Validated EmployeeDeclareAddListQueryParam queryParam) {
+//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Add(queryParam, UserContext.getCurrentUser());
+//        return WeaResult.success(exportMap);
+//    }
+//
+//    /**
+//     * 人员报送-导出本月信息变动人员
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @Path("/export4Update")
+//    @ApiOperation("人员报送-导出本月信息变动人员")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public WeaResult<Object> export4Update(@RequestBody @Validated EmployeeDeclareListQueryParam queryParam) {
+//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Update(queryParam, UserContext.getCurrentUser());
+//        return WeaResult.success(exportMap);
+//    }
+//
+//    /**
+//     * 人员报送-导出本月报送失败的人员
+//     *
+//     * @param queryParam 导出参数
+//     * @return
+//     */
+//    @Path("/export4Fail")
+//    @ApiOperation("人员报送-导出本月报送失败的人员")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public WeaResult<Object> export4Fail(@RequestBody @Validated EmployeeDeclareFailListQueryParam queryParam) {
+//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Fail(queryParam, UserContext.getCurrentUser());
+//        return WeaResult.success(exportMap);
+//    }
+//
+//     @Path("/getImportParam")
+//    @ApiOperation("人员报送-获取导入参数")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public WeaResult<ExcelImportParam> getAcctResultImportParams() {
+//        String tenantKey = TenantContext.getCurrentTenantKey();
+//        Long currentEmployeeId = UserContext.getCurrentEmployeeId();
+//        return WeaResult.success(salaryBatchService.buildImportParam("importEmployeeDeclare",
+//                "importEmployeeDeclare",
+//                SalaryI18nUtil.getI18nLabel(tenantKey, currentEmployeeId, 158769, "人员信息报送"),
+//                null,
+//                null));
+//    }
+//
+//    /**
+//     * 人员报送-导出导入模板
+//     *
+//     * @param importParam 获取导入模板
+//     * @return
+//     */
+//    @Path("/exportTemplate")
+//    @ApiOperation("人员报送-导出导入模板")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public WeaResult<Object> exportTemplate(@RequestBody @Validated EmployeeDeclareImportParam importParam) {
+//        Map<String, Object> exportMap = employeeDeclareWrapper.exportTemplate(importParam, UserContext.getCurrentUser());
+//        return WeaResult.success(exportMap);
+//    }
+
+
+    //4.2.5年收入不足6万元的纳税人暂不预扣预缴税款
+
+
+}
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
new file mode 100644
index 000000000..697621d67
--- /dev/null
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -0,0 +1,34 @@
+package com.engine.salary.wrapper;
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.core.impl.Service;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.service.*;
+import com.engine.salary.service.impl.*;
+import lombok.extern.slf4j.Slf4j;
+import weaver.hrm.User;
+
+/**
+ * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Slf4j
+public class DeductionAmountWrapper extends Service {
+    private DeductionAmountService getDeductionAmountService(User user) {
+        return ServiceUtil.getService(DeductionAmountServiceImpl.class, user);
+    }
+
+
+    public Object query(DeductionAmountOnlineQueryParam queryParam) {
+        return getDeductionAmountService(user).query(queryParam);
+    }
+
+    public void add(DeductionAmountAddParam param) {
+        getDeductionAmountService(user).add(param);
+    }
+}
diff --git a/test/ParseTaxApi.java b/test/ParseTaxApi.java
index 716d56807..56bb4a986 100644
--- a/test/ParseTaxApi.java
+++ b/test/ParseTaxApi.java
@@ -7,9 +7,9 @@ import java.util.List;
 
 public class ParseTaxApi {
     public static void main(String[] args) {
-//        readExcel("H:\\code\\salary\\test\\ApiDes.xlsx");
+        readExcel("H:\\code\\salary\\test\\ApiDes.xlsx");
 
-        readExcel2("H:\\code\\salary\\test\\ApiDes.xlsx");
+//        readExcel2("H:\\code\\salary\\test\\ApiDes.xlsx");
     }
 
 

From 0eb2b140e980078c13024ede1dbab60a24072015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 10 Mar 2025 17:46:40 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E6=8A=A5?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/FailEmployeeListDTO.java              |  4 +-
 .../impl/TaxDeclareRecordServiceImpl.java     | 85 ++++++++++++++-----
 2 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java
index a6e79e5ec..a5d1ef376 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/FailEmployeeListDTO.java
@@ -48,7 +48,7 @@ public class FailEmployeeListDTO {
     private String errorMsg;
 
     //所得项目
-    @TableTitle(title = "所得项目", dataIndex = "incomeCategory", key = "incomeCategory")
-    @ExcelHead(title = "所得项目", dataIndex = "incomeCategory")
+//    @TableTitle(title = "所得项目", dataIndex = "incomeCategory", key = "incomeCategory")
+//    @ExcelHead(title = "所得项目", dataIndex = "incomeCategory")
     private String incomeCategory;
 }
diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
index f5d3f94b6..af3d81c1c 100644
--- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
@@ -822,27 +822,72 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         if (declareFeedBackStatusEnum == DeclareFeedBackStatusEnum.DECLARE_FAIL) {
             List<Map> failInfoList = JsonUtil.parseList(Util.null2String(declareTaxFeedbackResponse.getBody().getOrDefault("fknr", "")).replace("\\\"", "\""), Map.class);
             for (Map map : failInfoList) {
-                String msg = Util.null2String(map.get("msg"));
-                if (StringUtils.isNotEmpty(msg)) {
-                    errorMsg.add(msg);
-                }
-                List<List> details = JsonUtil.parseList(map.get("details"), List.class);
-                if (details != null) {
-                    for (List detail : details) {
-                        String employeeName = Util.null2String(detail.get(0));
-                        String cardNum = Util.null2String(detail.get(2));
-                        String incomeCategoryCode = Util.null2String(detail.get(4));
-                        TaxDeclareFailPO taxDeclareFailPO = TaxDeclareFailPO.builder().id(IdGenerator.generate()).taxDeclareRecordId(taxDeclareRecord.getId()).employeeName(employeeName).cardNum(cardNum).incomeCategory(incomeCategoryCode).errorMsg(msg).tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY).creator((long) user.getUID()).deleteType(DeleteTypeEnum.NOT_DELETED.getValue()).createTime(now).updateTime(now).build();
-                        taxDeclareFails.add(taxDeclareFailPO);
-                        //  流量使用记录
-                        EmployeeDeclarePO employeeDeclarePO = employeeInfoMap.get(employeeName + "-" + cardNum);
-                        if (Objects.isNull(employeeDeclarePO)) {
-                            continue;
+                if (map.containsKey("details")) {
+                    List<List> details = JsonUtil.parseList(map.get("details"), List.class);
+                    if (details != null) {
+                        for (List detail : details) {
+                            String employeeName = Util.null2String(detail.get(0));
+                            String cardNum = Util.null2String(detail.get(2));
+                            String detailMsg = Util.null2String(detail.get(1));
+                            errorMsg.add("【" + employeeName + "】" + detailMsg);
+                            TaxDeclareFailPO taxDeclareFailPO = TaxDeclareFailPO.builder()
+                                    .id(IdGenerator.generate())
+                                    .taxDeclareRecordId(taxDeclareRecord.getId())
+                                    .employeeName(employeeName)
+                                    .cardNum(cardNum)
+                                    .incomeCategory("")
+                                    .errorMsg(detailMsg)
+                                    .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                                    .creator((long) user.getUID())
+                                    .deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
+                                    .createTime(now)
+                                    .updateTime(now)
+                                    .build();
+                            taxDeclareFails.add(taxDeclareFailPO);
+                            //  流量使用记录
+                            EmployeeDeclarePO employeeDeclarePO = employeeInfoMap.get(employeeName + "-" + cardNum);
+                            if (Objects.isNull(employeeDeclarePO)) {
+                                continue;
+                            }
+                            TaxDeclarationApiFlowRecordPO flowDetailPO = TaxApiFlowBO.buildTaxDeclarationApiFlowRecordPO(apiFlowUpdateWrapper, taxDeclareRecord.getTaxAgentId(), employeeDeclarePO.getEmployeeId());
+                            flowDetailPO.setResultStatus(TaxAgentTaxReturnStatusEnum.FAIL.getValue());
+                            apiFlowUpdateWrapper.getApiFlowDetailPOList().add(flowDetailPO);
+                            employeeInfoMap.remove(employeeName + "-" + cardNum);
+                        }
+                    }
+                }
+                if (map.containsKey("employeeList")) {
+                    List<Map> emps = JsonUtil.parseList(map.get("employeeList"), Map.class);
+                    if (emps != null) {
+                        for (Map detail : emps) {
+                            String employeeName = Util.null2String(detail.get("xm"));
+                            String cardNum = Util.null2String(detail.get("zzhm"));
+                            String detailMsg = Util.null2String(detail.get("cwxx"));
+                            errorMsg.add("【" + employeeName + "】" + detailMsg);
+                            TaxDeclareFailPO taxDeclareFailPO = TaxDeclareFailPO.builder()
+                                    .id(IdGenerator.generate()).
+                                    taxDeclareRecordId(taxDeclareRecord.getId())
+                                    .employeeName(employeeName)
+                                    .cardNum(cardNum)
+                                    .incomeCategory("")
+                                    .errorMsg(detailMsg)
+                                    .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                                    .creator((long) user.getUID())
+                                    .deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
+                                    .createTime(now)
+                                    .updateTime(now)
+                                    .build();
+                            taxDeclareFails.add(taxDeclareFailPO);
+                            //  流量使用记录
+                            EmployeeDeclarePO employeeDeclarePO = employeeInfoMap.get(employeeName + "-" + cardNum);
+                            if (Objects.isNull(employeeDeclarePO)) {
+                                continue;
+                            }
+                            TaxDeclarationApiFlowRecordPO flowDetailPO = TaxApiFlowBO.buildTaxDeclarationApiFlowRecordPO(apiFlowUpdateWrapper, taxDeclareRecord.getTaxAgentId(), employeeDeclarePO.getEmployeeId());
+                            flowDetailPO.setResultStatus(TaxAgentTaxReturnStatusEnum.FAIL.getValue());
+                            apiFlowUpdateWrapper.getApiFlowDetailPOList().add(flowDetailPO);
+                            employeeInfoMap.remove(employeeName + "-" + cardNum);
                         }
-                        TaxDeclarationApiFlowRecordPO flowDetailPO = TaxApiFlowBO.buildTaxDeclarationApiFlowRecordPO(apiFlowUpdateWrapper, taxDeclareRecord.getTaxAgentId(), employeeDeclarePO.getEmployeeId());
-                        flowDetailPO.setResultStatus(TaxAgentTaxReturnStatusEnum.FAIL.getValue());
-                        apiFlowUpdateWrapper.getApiFlowDetailPOList().add(flowDetailPO);
-                        employeeInfoMap.remove(employeeName + "-" + cardNum);
                     }
                 }
             }

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 04/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=A3=E9=99=A4?=
 =?UTF-8?q?=E5=90=8D=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);
+                });
     }
 }

From a119e7c7cde6a6e117ab5be81d58dcba65ef43db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 12 Mar 2025 13:55:59 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E6=89=A3=E9=99=A4=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DeductionAmountDTO.java               | 123 ++++++++++++++++++
 .../param/DeductionAmountListParam.java       |  36 +++++
 .../deductionamount/po/DeductionAmountPO.java |   6 +
 .../deductionamount/DeductionAmountMapper.xml |  15 +++
 .../tax/client/DeductionAmountClient.java     |   9 +-
 .../ConfirmPreDeductRequest.java              |   1 +
 .../service/DeductionAmountService.java       |  12 +-
 .../impl/DeductionAmountServiceImpl.java      | 109 ++++++++++++----
 .../salary/web/DeductionAmountController.java |  24 +++-
 .../wrapper/DeductionAmountWrapper.java       |  21 ++-
 10 files changed, 320 insertions(+), 36 deletions(-)
 create mode 100644 src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountListParam.java

diff --git a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
new file mode 100644
index 000000000..d5a2d3fcb
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
@@ -0,0 +1,123 @@
+package com.engine.salary.entity.deductionamount.dto;
+
+import com.engine.salary.annotation.TableTitle;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 人员报送记录
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_deduction_amount
+public class DeductionAmountDTO {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 个税扣缴义务人ID
+     */
+    private Long taxAgentId;
+
+
+    /**
+     * 税款所属年度
+     */
+    @TableTitle(title = "税款所属年度", dataIndex = "year", key = "year")
+    private String year;
+    /**
+     * 人员id
+     */
+    private Long employeeId;
+
+    /**
+     * 姓名
+     */
+    @TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
+    private String employeeName;
+
+    /**
+     * 人员类型
+     */
+    private Integer employeeType;
+
+    /**
+     * 工号
+     */
+    @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
+    private String jobNum;
+
+    /**
+     * 证件号码
+     */
+    @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
+    private String cardNum;
+
+    /**
+     * 证件类型
+     */
+    private Integer cardType;
+
+    /**
+     * 国籍
+     */
+    @TableTitle(title = "国籍", dataIndex = "nationality", key = "nationality")
+    private String nationality;
+
+    /**
+     * 是否扣除
+     */
+    @TableTitle(title = "是否扣除", dataIndex = "deductFlag", key = "deductFlag")
+    private Integer deductFlag;
+
+    /**
+     * 报送状态
+     */
+    @TableTitle(title = "报送状态", dataIndex = "declareStatus", key = "declareStatus")
+    private Integer declareStatus;
+
+
+    /**
+     * 是否成功报送过
+     */
+    private Integer successfullyDeclared;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    private Long creator;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleteType;
+
+    /**
+     * 租户KEY
+     */
+    private String tenantKey;
+
+    //主键id集合
+    private Collection<Long> ids;
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountListParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountListParam.java
new file mode 100644
index 000000000..0ce30402b
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountListParam.java
@@ -0,0 +1,36 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.common.BaseQueryParam;
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountListParam extends BaseQueryParam {
+
+    /**
+     * 个税扣缴义务人id
+     */
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    /**
+     * 税款所属年度
+     */
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
+
+}
diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
index 642b98098..731a211da 100644
--- a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
@@ -61,6 +61,12 @@ public class DeductionAmountPO {
     @ElogTransform(name = "工号")
     private String jobNum;
 
+    /**
+     * 国籍
+     */
+    @ElogTransform(name = "国籍")
+    private String nationality;
+
     /**
      * 证件号码
      */
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
index f41492135..db85a9649 100644
--- a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
@@ -19,6 +19,7 @@
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
         <result column="year" property="year"/>
+        <result column="nationality" property="nationality"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -42,6 +43,7 @@
         , t.tenant_key
         , t.update_time
         , t.year
+        , t.nationality
     </sql>
 
     <!-- 查询全部 -->
@@ -118,6 +120,9 @@
         <if test="year != null">
             AND year = #{year}
         </if>
+        <if test="nationality != null">
+            AND nationality = #{nationality}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -184,6 +189,9 @@
             <if test="year != null">
                 year,
             </if>
+            <if test="nationality != null">
+                nationality,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="cardNum != null">
@@ -237,6 +245,9 @@
             <if test="year != null">
                 #{year},
             </if>
+            <if test="nationality != null">
+                #{nationality},
+            </if>
         </trim>
     </insert>
 
@@ -261,6 +272,7 @@
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
             year=#{year},
+            nationality=#{nationality},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -318,6 +330,9 @@
             <if test="year != null">
                 year=#{year},
             </if>
+            <if test="nationality != null">
+                nationality=#{nationality},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
index bb9b92e9c..32e129c94 100644
--- a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
+++ b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -60,7 +61,7 @@ public class DeductionAmountClient extends TaxBaseClient {
 
 
 
-    public String confirmPreDeduct(String year) {
+    public String confirmPreDeduct(String year, List<ConfirmPreDeductRequest.kczg> kczglb ) {
 
         String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/queryPreDeduct";
         ConfirmPreDeductRequest request = new ConfirmPreDeductRequest();
@@ -78,16 +79,16 @@ public class DeductionAmountClient extends TaxBaseClient {
         request.setJmsmmm("1");
         request.setMmlx("" + returnPO.getPasswordType());
         request.setSkssnd(year);
-        request.setKczglb(null);
+        request.setKczglb(kczglb);
 
         String reqJson = JsonUtil.toJsonString(request);
-        log.info("queryDeductionAmountRequest params --- \n{}\n", reqJson);
+        log.info("confirmPreDeduct params --- \n{}\n", reqJson);
         Map<String, String> params = new HashMap<>(1);
         Map<String, String> header = SingnatureData.initHeader(params, apiConfig.getAppKey(), apiConfig.getAppSecret());
 
         //  开始请求
         String res = HttpUtil.doPost(url, header, reqJson, HttpUtil.JSON_TYPE);
-        log.info("queryDeductionAmountRequest res --- {}", res);
+        log.info("confirmPreDeduct res --- {}", res);
         return res;
     }
 }
diff --git a/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java b/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
index 035c90543..635c146ec 100644
--- a/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
+++ b/src/com/engine/salary/remote/tax/request/deductionAmount/ConfirmPreDeductRequest.java
@@ -69,6 +69,7 @@ public class ConfirmPreDeductRequest {
     private List<kczg> kczglb;
 
 
+    @Data
     public static class kczg {
         /**
          * 姓名
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
index a72534724..16a86ffbe 100644
--- a/src/com/engine/salary/service/DeductionAmountService.java
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -1,6 +1,10 @@
 package com.engine.salary.service;
 
+import com.engine.salary.component.PageInfo;
+import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
 
 /**
@@ -13,7 +17,13 @@ import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQuery
  **/
 public interface DeductionAmountService {
 
-    Object query(DeductionAmountOnlineQueryParam queryParam);
+    PageInfo<DeductionAmountDTO> list(DeductionAmountListParam param);
 
     void add(DeductionAmountAddParam param);
+
+    Object query(DeductionAmountOnlineQueryParam param);
+
+    Object confirm(DeductionAmountConfirmParam param);
+
+
 }
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index 7fd9c25bb..73083cf2b 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -3,17 +3,25 @@ package com.engine.salary.service.impl;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.component.PageInfo;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
+import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
 import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
 import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
+import com.engine.salary.enums.SalaryOnOffEnum;
+import com.engine.salary.enums.employeedeclare.CardTypeEnum;
 import com.engine.salary.mapper.deductionamount.DeductionAmountMapper;
 import com.engine.salary.mapper.employeedeclare.EmployeeDeclareMapper;
 import com.engine.salary.remote.tax.client.DeductionAmountClient;
+import com.engine.salary.remote.tax.request.deductionAmount.ConfirmPreDeductRequest;
 import com.engine.salary.service.*;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -70,11 +78,35 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
         return ServiceUtil.getService(TaxDeclarationApiBillingServiceImpl.class, user);
     }
 
+
     @Override
-    public Object query(DeductionAmountOnlineQueryParam queryParam) {
-        Long taxAgentId = queryParam.getTaxAgentId();
-        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
-        return deductionAmountClient.query(queryParam.getYear());
+    public PageInfo<DeductionAmountDTO> list(DeductionAmountListParam param) {
+        ValidUtil.doValidator(param);
+
+        List<DeductionAmountPO> deductionAmountPOS = getDeductionAmountMapper().listSome(DeductionAmountPO.builder().year(param.getYear()).taxAgentId(param.getTaxAgentId()).build());
+
+        List<DeductionAmountDTO> list = deductionAmountPOS.stream().map(deductionAmountPO -> {
+            return DeductionAmountDTO.builder()
+                    .id(deductionAmountPO.getId())
+                    .taxAgentId(deductionAmountPO.getEmployeeId())
+                    .year(deductionAmountPO.getYear())
+                    .employeeId(deductionAmountPO.getEmployeeId())
+                    .employeeName(deductionAmountPO.getEmployeeName())
+                    .employeeType(deductionAmountPO.getEmployeeType())
+                    .jobNum(deductionAmountPO.getJobNum())
+                    .nationality(deductionAmountPO.getNationality())
+                    .cardNum(deductionAmountPO.getCardNum())
+                    .cardType(deductionAmountPO.getCardType())
+                    .declareStatus(deductionAmountPO.getDeclareStatus())
+                    .deductFlag(deductionAmountPO.getDeductFlag())
+                    .successfullyDeclared(deductionAmountPO.getSuccessfullyDeclared())
+                    .creator(deductionAmountPO.getCreator())
+                    .createTime(deductionAmountPO.getCreateTime())
+                    .updateTime(deductionAmountPO.getUpdateTime())
+                    .build();
+        }).collect(Collectors.toList());
+
+       return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, DeductionAmountDTO.class);
     }
 
     @Override
@@ -92,25 +124,54 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
         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);
-                });
+                .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())
+                        .nationality(employeeDeclarePO.getNationality())
+                        .declareStatus(0)
+                        .deductFlag(1)
+                        .successfullyDeclared(0)
+                        .creator((long) user.getUID())
+                        .createTime(now)
+                        .updateTime(now)
+                        .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                        .deleteType(NumberUtils.INTEGER_ZERO)
+                        .build())
+                .forEach(deductionAmountPO -> getDeductionAmountMapper().insertIgnoreNull(deductionAmountPO));
+    }
+
+    @Override
+    public Object query(DeductionAmountOnlineQueryParam param) {
+        Long taxAgentId = param.getTaxAgentId();
+        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
+        return deductionAmountClient.query(param.getYear());
+    }
+
+    @Override
+    public Object confirm(DeductionAmountConfirmParam param) {
+        ValidUtil.doValidator(param);
+        Long taxAgentId = param.getTaxAgentId();
+        String year = param.getYear();
+        List<DeductionAmountPO> deductionAmountPOS = getDeductionAmountMapper().listSome(DeductionAmountPO.builder().taxAgentId(taxAgentId).year(year).build());
+        List<ConfirmPreDeductRequest.kczg> kczglb = deductionAmountPOS.stream()
+                .map(deductionAmountPO -> {
+                    ConfirmPreDeductRequest.kczg kczg = new ConfirmPreDeductRequest.kczg();
+                    kczg.setXm(deductionAmountPO.getEmployeeName());
+                    kczg.setZzhm(deductionAmountPO.getCardNum());
+                    kczg.setZzlx(CardTypeEnum.getByValue(deductionAmountPO.getCardType()).getDefaultLabel());
+                    kczg.setGj(deductionAmountPO.getNationality());
+                    kczg.setKcbs(SalaryOnOffEnum.parseByValue(deductionAmountPO.getDeductFlag()).getDefaultLabel());
+                    return kczg;
+                }).collect(Collectors.toList());
+
+        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
+        return deductionAmountClient.confirmPreDeduct(year, kczglb);
     }
 }
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
index e9ad983fc..819598cb9 100644
--- a/src/com/engine/salary/web/DeductionAmountController.java
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -2,7 +2,11 @@ package com.engine.salary.web;
 
 
 import com.engine.common.util.ServiceUtil;
+import com.engine.salary.component.PageInfo;
+import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
 import com.engine.salary.util.ResponseResult;
 import com.engine.salary.wrapper.DeductionAmountWrapper;
@@ -34,6 +38,14 @@ public class DeductionAmountController {
         return ServiceUtil.getService(DeductionAmountWrapper.class, user);
     }
 
+    @POST
+    @Path("/list")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountListParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountListParam, PageInfo<DeductionAmountDTO>>(user).run(getDeductionAmountWrapper(user)::list, param);
+    }
+
     @POST
     @Path("/add")
     @Produces(MediaType.APPLICATION_JSON)
@@ -45,9 +57,17 @@ public class DeductionAmountController {
     @POST
     @Path("/query")
     @Produces(MediaType.APPLICATION_JSON)
-    public String queryPreDeduct(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountOnlineQueryParam queryParam) {
+    public String query(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountOnlineQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<DeductionAmountOnlineQueryParam, Object>(user).run(getDeductionAmountWrapper(user)::query, queryParam);
+        return new ResponseResult<DeductionAmountOnlineQueryParam, Object>(user).run(getDeductionAmountWrapper(user)::query, param);
+    }
+
+    @POST
+    @Path("/confirm")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String confirm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountConfirmParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
     }
 
 //    @POST
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
index 697621d67..c9bada6fa 100644
--- a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -2,10 +2,14 @@ package com.engine.salary.wrapper;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.component.PageInfo;
+import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
+import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
 import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
-import com.engine.salary.service.*;
-import com.engine.salary.service.impl.*;
+import com.engine.salary.service.DeductionAmountService;
+import com.engine.salary.service.impl.DeductionAmountServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import weaver.hrm.User;
 
@@ -23,12 +27,19 @@ public class DeductionAmountWrapper extends Service {
         return ServiceUtil.getService(DeductionAmountServiceImpl.class, user);
     }
 
-
-    public Object query(DeductionAmountOnlineQueryParam queryParam) {
-        return getDeductionAmountService(user).query(queryParam);
+    public PageInfo<DeductionAmountDTO> list(DeductionAmountListParam param) {
+        return getDeductionAmountService(user).list(param);
     }
 
     public void add(DeductionAmountAddParam param) {
         getDeductionAmountService(user).add(param);
     }
+
+    public Object query(DeductionAmountOnlineQueryParam param) {
+        return getDeductionAmountService(user).query(param);
+    }
+
+    public Object confirm(DeductionAmountConfirmParam param) {
+        return getDeductionAmountService(user).confirm(param);
+    }
 }

From 3fb29b2c3dcef4a63e45081578d22f78030886b3 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 12 Mar 2025 18:21:04 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E5=81=9C=E8=96=AAaction=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/action/CheckStopSalaryAction.java | 7 ++++++-
 src/com/engine/salary/action/StopSalaryAction.java      | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/action/CheckStopSalaryAction.java b/src/com/engine/salary/action/CheckStopSalaryAction.java
index 78b3c0a7c..6243e6ed5 100644
--- a/src/com/engine/salary/action/CheckStopSalaryAction.java
+++ b/src/com/engine/salary/action/CheckStopSalaryAction.java
@@ -96,15 +96,18 @@ public class CheckStopSalaryAction implements Action {
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){
                 requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！");
                 return FAILURE_AND_CONTINUE;
             }
             Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
             Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
             if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
                 requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！");
                 return FAILURE_AND_CONTINUE;
             }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
                 requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
                 return FAILURE_AND_CONTINUE;
             }
 
@@ -115,15 +118,17 @@ public class CheckStopSalaryAction implements Action {
             List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
             if(CollectionUtils.isEmpty(salaryArchiveList)){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             if(salaryArchiveList.size() > 1){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
+                log.error("停薪检查异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
 
         } catch (Exception e) {
-            log.error("停薪校验异常", e);
+            log.error("停薪检查异常", e);
             requestInfo.getRequestManager().setMessage(e.getMessage());
             return FAILURE_AND_CONTINUE;
         }
diff --git a/src/com/engine/salary/action/StopSalaryAction.java b/src/com/engine/salary/action/StopSalaryAction.java
index 6433e4e95..10d4d765a 100644
--- a/src/com/engine/salary/action/StopSalaryAction.java
+++ b/src/com/engine/salary/action/StopSalaryAction.java
@@ -107,15 +107,18 @@ public class StopSalaryAction implements Action {
             List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName);
             if(CollectionUtils.isEmpty(taxAgentPOS)){
                 requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！");
                 return FAILURE_AND_CONTINUE;
             }
             Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() );
             Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString());
             if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){
                 requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！");
                 return FAILURE_AND_CONTINUE;
             }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){
                 requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString());
                 return FAILURE_AND_CONTINUE;
             }
 
@@ -123,10 +126,12 @@ public class StopSalaryAction implements Action {
             List<SalaryArchivePO> salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build());
             if(CollectionUtils.isEmpty(salaryArchiveList)){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             if(salaryArchiveList.size() > 1){
                 requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
+                log.error("停薪异常 requestId:{}  msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！");
                 return FAILURE_AND_CONTINUE;
             }
             // 设置最后发薪日期

From bad6928f34da84ad53d509211e1bb07812e4a4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 14 Mar 2025 15:56:28 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/DeductionAmountDeleteParam.java     |  27 ++
 .../service/DeductionAmountService.java       |   7 +-
 .../impl/DeductionAmountServiceImpl.java      |  18 +-
 .../salary/web/DeductionAmountController.java | 386 ------------------
 .../wrapper/DeductionAmountWrapper.java       |   9 +-
 5 files changed, 48 insertions(+), 399 deletions(-)
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountDeleteParam.java

diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountDeleteParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountDeleteParam.java
new file mode 100644
index 000000000..922884a44
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountDeleteParam.java
@@ -0,0 +1,27 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountDeleteParam {
+    /**
+     * ID
+     */
+    private List<Long> ids;
+}
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
index 16a86ffbe..6e005cbc2 100644
--- a/src/com/engine/salary/service/DeductionAmountService.java
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -2,10 +2,7 @@ package com.engine.salary.service;
 
 import com.engine.salary.component.PageInfo;
 import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.entity.deductionamount.param.*;
 
 /**
  * 年收入不足6万元的纳税人暂不预扣预缴税款扣除名单
@@ -21,6 +18,8 @@ public interface DeductionAmountService {
 
     void add(DeductionAmountAddParam param);
 
+    void delete(DeductionAmountDeleteParam param);
+
     Object query(DeductionAmountOnlineQueryParam param);
 
     Object confirm(DeductionAmountConfirmParam param);
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index 73083cf2b..700e8c622 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -1,15 +1,13 @@
 package com.engine.salary.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.component.PageInfo;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.entity.deductionamount.param.*;
 import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
 import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
 import com.engine.salary.enums.SalaryOnOffEnum;
@@ -106,7 +104,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                     .build();
         }).collect(Collectors.toList());
 
-       return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, DeductionAmountDTO.class);
+        return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, DeductionAmountDTO.class);
     }
 
     @Override
@@ -147,6 +145,16 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                 .forEach(deductionAmountPO -> getDeductionAmountMapper().insertIgnoreNull(deductionAmountPO));
     }
 
+    @Override
+    public void delete(DeductionAmountDeleteParam param) {
+        if (CollUtil.isEmpty(param.getIds())) {
+            return;
+        }
+        param.getIds().forEach(id -> {
+            getDeductionAmountMapper().delete(DeductionAmountPO.builder().id(id).build());
+        });
+    }
+
     @Override
     public Object query(DeductionAmountOnlineQueryParam param) {
         Long taxAgentId = param.getTaxAgentId();
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
index 819598cb9..6c0950cd7 100644
--- a/src/com/engine/salary/web/DeductionAmountController.java
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -70,393 +70,7 @@ public class DeductionAmountController {
         return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
     }
 
-//    @POST
-//    @Path("/confirmPreDeduct")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String queryPreDeduct(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountConfirmParam param) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
-//    }
 
-//    /**
-//     * 人员报送-个税扣缴义务人列表
-//     *
-//     * @param param 查询条件
-//     * @return
-//     */
-//    @POST
-//    @Path("/taxAgentDeclareList")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String taxAgentDeclareList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxAgentDeclareListQueryParam param) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<TaxAgentDeclareListQueryParam, PageInfo<TaxAgentDeclareListDTO>>(user).run(getEmployeeDeclareWrapper(user)::taxAgentDeclareList, param);
-//    }
-//
-//    /**
-//     * 人员报送-全部人员列表
-//     *
-//     * @param queryParam 查询条件
-//     * @return
-//     */
-//    @POST
-//    @Path("/list")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list, queryParam);
-//    }
-//
-//    /**
-//     * 人员报送-本月新增人员列表
-//     *
-//     * @param queryParam 查询条件
-//     * @return
-//     */
-//    @POST
-//    @Path("/list4Add")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String list4Add(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareAddListQueryParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareAddListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list4Add, queryParam);
-//    }
-//
-//    /**
-//     * 人员报送-本月信息变动列表
-//     *
-//     * @param queryParam 查询条件
-//     * @return
-//     */
-//    @POST
-//    @Path("/list4Update")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String list4Update(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareListQueryParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::list4Update, queryParam);
-//    }
-//
-//    /**
-//     * 人员报送-本月报送失败人员列表
-//     *
-//     * @param queryParam 查询条件
-//     * @return
-//     */
-//    @POST
-//    @Path("/list4Fail")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String list4Fail(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareFailListQueryParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareFailListQueryParam, PageInfo<EmployeeDeclareFailListDTO>>(user).run(getEmployeeDeclareWrapper(user)::list4Fail, queryParam);
-//    }
-//
-//    /**
-//     * 人员报送-获取新建或编辑的表单
-//     *
-//     * @param id 报送人员列表的主键id
-//     * @return
-//     */
-//    @GET
-//    @Path("/getForm")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String getForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<Long, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::getForm, id);
-//    }
-//
-////    @GetMapping("/getBatchUpdateForm")
-////    @ApiOperation("人员报送-获取批量编辑的表单")
-////    @Produces(MediaType.APPLICATION_JSON)
-////    public WeaResult<WeaForm> getBatchUpdateForm() {
-////        WeaForm weaForm = employeeDeclareWrapper.getBatchUpdateForm();
-////        return WeaResult.success(weaForm);
-////    }
-////
-////    @GetMapping("/getSearchCondition")
-////    @ApiOperation("人员报送-获取高级搜索条件")
-////    @Produces(MediaType.APPLICATION_JSON)
-////    public WeaResult<WeaSearchCondition> getSearchCondition() {
-////        WeaSearchCondition searchCondition = employeeDeclareWrapper.getSearchCondition();
-////        return WeaResult.success(searchCondition);
-////    }
-//
-//    /**
-//     * 人员报送-新增人员/编辑人员保存
-//     *
-//     * @param saveParam 保存参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/save")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String save(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareSaveParam saveParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareSaveParam, PageInfo<EmployeeDeclareFailListDTO>>(user).run(getEmployeeDeclareWrapper(user)::save, saveParam);
-//    }
-//
-////    /**
-////     * 人员报送-批量编辑
-////     *
-////     * @param batchUpdateParam 批量编辑参数
-////     * @return
-////     */
-////    @Path("/batchUpdate")
-////    @ApiOperation("人员报送-批量编辑")
-////    @Produces(MediaType.APPLICATION_JSON)
-////    public WeaResult<Object> batchUpdate(@RequestBody @Validated EmployeeDeclareBatchUpdateParam batchUpdateParam) {
-////        employeeDeclareWrapper.batchUpdate(batchUpdateParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
-////        return WeaResult.success(null);
-////    }
-//
-//    /**
-//     * 人员报送-删除
-//     *
-//     * @param ids 待删除的主键id
-//     * @return
-//     */
-//    @POST
-//    @Path("/delete")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Collection<Long> ids) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<Collection<Long>, String>(user).run(getEmployeeDeclareWrapper(user)::deleteByIds, ids);
-//    }
-//
-//    /**
-//     * 人员报送-刷新数据
-//     *
-//     * @param refreshParam 刷新数据的参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/refresh")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String refresh(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareRefreshParam refreshParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareRefreshParam, String>(user).run(getEmployeeDeclareWrapper(user)::refresh, refreshParam);
-//    }
-//
-//    /**
-//     * 人员报送-获取整体的报送情况
-//     *
-//     * @param employeeDeclareParam 获取整体的报送情况的参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/getDeclareInfo")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String getDeclareInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareParam, EmployeeDeclareInfoDTO>(user).run(getEmployeeDeclareWrapper(user)::getDeclareInfo, employeeDeclareParam);
-//    }
-//
-//    /**
-//     * 人员报送-全部报送
-//     *
-//     * @param employeeDeclareParam 在线报送
-//     * @return
-//     */
-//    @POST
-//    @Path("/declare")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String declare(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareParam, String>(user).run(getEmployeeDeclareWrapper(user)::declare, employeeDeclareParam);
-//    }
-//
-//    /**
-//     * 人员报送-获取报送结果反馈
-//     *
-//     * @param employeeDeclareParam 获取反馈
-//     * @return
-//     */
-//    @POST
-//    @Path("/getDeclareFeedback")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String getDeclareFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareParam, String>(user).run(getEmployeeDeclareWrapper(user)::getDeclareFeedback, employeeDeclareParam);
-//    }
-//
-//
-//    /**
-//     * 人员报送-后端业务逻辑是否已经完成
-//     *
-//     * @param index 进度索引
-//     * @return
-//     */
-//    @GET
-//    @Path("/getRate")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String getRate(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "index") String index) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<String, EmployeeDeclareRateDTO>(user).run(getEmployeeDeclareWrapper(user)::getRate, index);
-//    }
-//
-//    /**
-//     * 人员报送-下载导入模板
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/exportTemplate")
-//    @Produces(MediaType.APPLICATION_OCTET_STREAM)
-//    public Response exportTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
-//
-//        try {
-//            User user = HrmUserVarify.getUser(request, response);
-//            XSSFWorkbook workbook = getEmployeeDeclareWrapper(user).exportTemplate(queryParam);
-//            String fileName = "人员信息采集导入模板-" + LocalDate.now();
-//            try {
-//                fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//
-//            StreamingOutput output = outputStream -> {
-//                workbook.write(outputStream);
-//                outputStream.flush();
-//            };
-//            response.setContentType("application/octet-stream");
-//            return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
-//        } catch (Exception e) {
-//            log.error("人员报送-人员信息采集导入模板异常", e);
-//            throw e;
-//        }
-//    }
-//
-//    /**
-//     * 人员报送-导入预览
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/preview")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String preview(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareImportParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::preview, queryParam);
-//    }
-//
-//    /**
-//     * 人员报送-导入
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/importData")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public String importData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareImportParam queryParam) {
-//        User user = HrmUserVarify.getUser(request, response);
-//        return new ResponseResult<EmployeeDeclareImportParam, Map<String, Object>>(user).run(getEmployeeDeclareWrapper(user)::importData, queryParam);
-//    }
-//
-//
-//    /**
-//     * 人员报送-导出全部人员
-//     *
-//     * @param param 导出参数
-//     * @return
-//     */
-//    @POST
-//    @Path("/export")
-//    @Produces(MediaType.APPLICATION_OCTET_STREAM)
-//    public Response export(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam param) {
-//
-//        try {
-//            User user = HrmUserVarify.getUser(request, response);
-//            XSSFWorkbook workbook = getEmployeeDeclareWrapper(user).export(param);
-//            String fileName = "人员信息采集-" + LocalDate.now();
-//            try {
-//                fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//
-//            StreamingOutput output = outputStream -> {
-//                workbook.write(outputStream);
-//                outputStream.flush();
-//            };
-//            response.setContentType("application/octet-stream");
-//            return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
-//        } catch (Exception e) {
-//            log.error("人员报送-导出全部人员异常", e);
-//            throw e;
-//        }
-//    }
-
-//    /**
-//     * 人员报送-导出本月新增人员
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @Path("/export4Add")
-//    @ApiOperation("人员报送-导出本月新增人员")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public WeaResult<Object> export4Add(@RequestBody @Validated EmployeeDeclareAddListQueryParam queryParam) {
-//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Add(queryParam, UserContext.getCurrentUser());
-//        return WeaResult.success(exportMap);
-//    }
-//
-//    /**
-//     * 人员报送-导出本月信息变动人员
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @Path("/export4Update")
-//    @ApiOperation("人员报送-导出本月信息变动人员")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public WeaResult<Object> export4Update(@RequestBody @Validated EmployeeDeclareListQueryParam queryParam) {
-//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Update(queryParam, UserContext.getCurrentUser());
-//        return WeaResult.success(exportMap);
-//    }
-//
-//    /**
-//     * 人员报送-导出本月报送失败的人员
-//     *
-//     * @param queryParam 导出参数
-//     * @return
-//     */
-//    @Path("/export4Fail")
-//    @ApiOperation("人员报送-导出本月报送失败的人员")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public WeaResult<Object> export4Fail(@RequestBody @Validated EmployeeDeclareFailListQueryParam queryParam) {
-//        Map<String, Object> exportMap = employeeDeclareWrapper.export4Fail(queryParam, UserContext.getCurrentUser());
-//        return WeaResult.success(exportMap);
-//    }
-//
-//     @Path("/getImportParam")
-//    @ApiOperation("人员报送-获取导入参数")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public WeaResult<ExcelImportParam> getAcctResultImportParams() {
-//        String tenantKey = TenantContext.getCurrentTenantKey();
-//        Long currentEmployeeId = UserContext.getCurrentEmployeeId();
-//        return WeaResult.success(salaryBatchService.buildImportParam("importEmployeeDeclare",
-//                "importEmployeeDeclare",
-//                SalaryI18nUtil.getI18nLabel(tenantKey, currentEmployeeId, 158769, "人员信息报送"),
-//                null,
-//                null));
-//    }
-//
-//    /**
-//     * 人员报送-导出导入模板
-//     *
-//     * @param importParam 获取导入模板
-//     * @return
-//     */
-//    @Path("/exportTemplate")
-//    @ApiOperation("人员报送-导出导入模板")
-//    @Produces(MediaType.APPLICATION_JSON)
-//    public WeaResult<Object> exportTemplate(@RequestBody @Validated EmployeeDeclareImportParam importParam) {
-//        Map<String, Object> exportMap = employeeDeclareWrapper.exportTemplate(importParam, UserContext.getCurrentUser());
-//        return WeaResult.success(exportMap);
-//    }
-
-
-    //4.2.5年收入不足6万元的纳税人暂不预扣预缴税款
 
 
 }
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
index c9bada6fa..9b03e533d 100644
--- a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -4,10 +4,7 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.component.PageInfo;
 import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.entity.deductionamount.param.*;
 import com.engine.salary.service.DeductionAmountService;
 import com.engine.salary.service.impl.DeductionAmountServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +32,10 @@ public class DeductionAmountWrapper extends Service {
         getDeductionAmountService(user).add(param);
     }
 
+    public void delete(DeductionAmountDeleteParam param) {
+        getDeductionAmountService(user).delete(param);
+    }
+
     public Object query(DeductionAmountOnlineQueryParam param) {
         return getDeductionAmountService(user).query(param);
     }

From a29f8b3da92f701543bf99b776e95d0839f2217a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 17 Mar 2025 11:03:42 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E6=A0=B9=E6=8D=AE=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalaryStatisticsEmployeeServiceImpl.java  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 1b45b4881..2e49c8353 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -13,6 +13,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
+import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
 import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper;
 import com.engine.salary.report.common.constant.SalaryConstant;
@@ -248,12 +249,23 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
         List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listAll();
         Map<Long, Integer> salaryAcctRecordMap = SalaryEntityUtil.convert2Map(salaryAcctRecordPOS, SalaryAcctRecordPO::getId, SalaryAcctRecordPO::getAcctTimes);
 
+        List<SalaryItemPO> salaryItemPOList = getSalaryItemService(user).listAll();
+        Map<Long, String> itemDataTypeMap = SalaryEntityUtil.convert2Map(salaryItemPOList, SalaryItemPO::getId, SalaryItemPO::getDataType);
+
+
         Map<Long, List<SalaryAcctResultPO>> acctResultValueList = SalaryEntityUtil.group2Map(salaryStatisticsEmployeeDetailResult.getSalaryAcctResultValueList(), SalaryAcctResultPO::getSalaryAcctEmpId);
-        Map<Long, Map<String, String>> acctResultValueMap = new HashMap<>();
+        Map<Long, Map<String, Object>> acctResultValueMap = new HashMap<>();
         acctResultValueList.forEach((k, v) -> {
-            Map<String, String> map = new HashMap();
+            Map<String, Object> map = new HashMap();
             v.forEach(l -> {
-                map.put(l.getSalaryItemId() + "", l.getResultValue());
+                String dataType = itemDataTypeMap.getOrDefault(l.getSalaryItemId(), "string");
+                SalaryDataTypeEnum typeEnum = SalaryDataTypeEnum.parseByValue(dataType);
+                String resultValue = l.getResultValue();
+                if (typeEnum == SalaryDataTypeEnum.NUMBER && NumberUtil.isNumber(resultValue)) {
+                    map.put(l.getSalaryItemId() + "", Double.valueOf(resultValue));
+                } else {
+                    map.put(l.getSalaryItemId() + "", resultValue);
+                }
             });
             acctResultValueMap.put(k, map);
         });
@@ -265,7 +277,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
         Map<String, Object> map;
         for (SalaryAcctEmployeePO se : salaryStatisticsEmployeeDetailResult.getSalaryAcctEmployeeList()) {
             map = Maps.newHashMap();
-            Map<String, String> resultValueMap = Optional.ofNullable(acctResultValueMap.get(se.getId())).orElse(Maps.newHashMap());
+            Map<String, Object> resultValueMap = Optional.ofNullable(acctResultValueMap.get(se.getId())).orElse(Maps.newHashMap());
             Map<String, Object> finalMap = map;
             resultValueMap.forEach((k, v) -> {
                 finalMap.put(k + SalaryConstant.DYNAMIC_SUFFIX, v);

From 660a2718a132bd7cf459ef12d760ed589a82eca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 17 Mar 2025 18:59:16 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E6=89=A3=E5=87=8F=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=92=8C=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/DeductionAmountFeedBackParam.java   | 30 +++++++++++++++++++
 .../tax/client/DeductionAmountClient.java     | 22 +++++++++-----
 .../service/DeductionAmountService.java       |  2 +-
 .../impl/DeductionAmountServiceImpl.java      | 14 +++++++--
 .../salary/web/DeductionAmountController.java | 22 ++++++++++----
 .../wrapper/DeductionAmountWrapper.java       |  4 +++
 6 files changed, 77 insertions(+), 17 deletions(-)
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java

diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java
new file mode 100644
index 000000000..9cd7ad6f5
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java
@@ -0,0 +1,30 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountFeedBackParam {
+
+    // 个税扣缴义务人id
+    @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
+    private Long taxAgentId;
+
+    @DataCheck(require = true, message = "参数错误，requestId不能为空")
+    private String requestId;
+
+}
diff --git a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
index 32e129c94..2eb13159d 100644
--- a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
+++ b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
@@ -9,10 +9,7 @@ import com.engine.salary.util.SingnatureData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 申报扣减客户端
@@ -60,10 +57,9 @@ public class DeductionAmountClient extends TaxBaseClient {
     }
 
 
+    public String confirm(String year, List<ConfirmPreDeductRequest.kczg> kczglb ) {
 
-    public String confirmPreDeduct(String year, List<ConfirmPreDeductRequest.kczg> kczglb ) {
-
-        String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/queryPreDeduct";
+        String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/confirmPreDeduct";
         ConfirmPreDeductRequest request = new ConfirmPreDeductRequest();
         request.setNsrsbh(returnPO.getTaxCode());
         request.setBizNo(UUID.randomUUID().toString().replace("-", ""));
@@ -91,4 +87,16 @@ public class DeductionAmountClient extends TaxBaseClient {
         log.info("confirmPreDeduct res --- {}", res);
         return res;
     }
+
+    public String feedback(String requestId) {
+        String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/getPreDeductConfirmFeedback";
+
+        Map<String, String> params = new HashMap<>(1);
+        params.put("requestId", requestId);
+        log.info("getPreDeductConfirmFeedback requestId --- \n{}\n", requestId);
+        Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
+        String res = HttpUtil.getRequest(url, header, params);
+        log.info("getPreDeductConfirmFeedback res --- {}", res);
+        return res;
+    }
 }
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
index 6e005cbc2..7d8b49879 100644
--- a/src/com/engine/salary/service/DeductionAmountService.java
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -24,5 +24,5 @@ public interface DeductionAmountService {
 
     Object confirm(DeductionAmountConfirmParam param);
 
-
+    void feedback(DeductionAmountFeedBackParam param);
 }
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index 700e8c622..4855fd950 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -18,6 +18,7 @@ import com.engine.salary.remote.tax.client.DeductionAmountClient;
 import com.engine.salary.remote.tax.request.deductionAmount.ConfirmPreDeductRequest;
 import com.engine.salary.service.*;
 import com.engine.salary.util.SalaryEntityUtil;
+import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
@@ -123,8 +124,8 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
         employeeDeclarePOS.stream()
                 .filter(employeeDeclarePO -> !oldIds.contains(employeeDeclarePO.getEmployeeId()))
                 .map(employeeDeclarePO -> DeductionAmountPO.builder()
-                        .id(employeeDeclarePO.getEmployeeId())
-                        .taxAgentId(employeeDeclarePO.getEmployeeId())
+                        .id(IdGenerator.generate())
+                        .taxAgentId(employeeDeclarePO.getTaxAgentId())
                         .year(param.getYear())
                         .employeeId(employeeDeclarePO.getEmployeeId())
                         .employeeName(employeeDeclarePO.getEmployeeName())
@@ -180,6 +181,13 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                 }).collect(Collectors.toList());
 
         DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
-        return deductionAmountClient.confirmPreDeduct(year, kczglb);
+        return deductionAmountClient.confirm(year, kczglb);
+    }
+
+    @Override
+    public void feedback(DeductionAmountFeedBackParam param) {
+        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(param.getTaxAgentId());
+        String feedback = deductionAmountClient.feedback(param.getRequestId());
+
     }
 }
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
index 6c0950cd7..b900b6872 100644
--- a/src/com/engine/salary/web/DeductionAmountController.java
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -4,10 +4,7 @@ package com.engine.salary.web;
 import com.engine.common.util.ServiceUtil;
 import com.engine.salary.component.PageInfo;
 import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountConfirmParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountListParam;
-import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
+import com.engine.salary.entity.deductionamount.param.*;
 import com.engine.salary.util.ResponseResult;
 import com.engine.salary.wrapper.DeductionAmountWrapper;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -54,6 +51,14 @@ public class DeductionAmountController {
         return new ResponseResult<DeductionAmountAddParam, Object>(user).run(getDeductionAmountWrapper(user)::add, param);
     }
 
+    @POST
+    @Path("/delete")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountDeleteParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountDeleteParam, Object>(user).run(getDeductionAmountWrapper(user)::delete, param);
+    }
+
     @POST
     @Path("/query")
     @Produces(MediaType.APPLICATION_JSON)
@@ -70,7 +75,12 @@ public class DeductionAmountController {
         return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
     }
 
-
-
+    @POST
+    @Path("/feedback")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String feedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountFeedBackParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountFeedBackParam, Object>(user).run(getDeductionAmountWrapper(user)::feedback, param);
+    }
 
 }
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
index 9b03e533d..7a474421f 100644
--- a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -43,4 +43,8 @@ public class DeductionAmountWrapper extends Service {
     public Object confirm(DeductionAmountConfirmParam param) {
         return getDeductionAmountService(user).confirm(param);
     }
+
+    public void feedback(DeductionAmountFeedBackParam param) {
+        getDeductionAmountService(user).feedback(param);
+    }
 }

From 3b520fcf62d6805b2bc1daa1af60191e53b8360f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 18 Mar 2025 17:31:32 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=92=8C=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E6=89=A7=E8=A1=8C=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../timer/AutoSyncEmpArchiveStartDateJob.java | 11 ++-
 .../AutoSyncResignationEmpArchiveJob.java     | 71 +++++++++++--------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java
index 6c817ed4e..683d1ddd0 100644
--- a/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java
+++ b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java
@@ -42,6 +42,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob {
 
+    private String syncInsuranceArchive;
+    private String syncSalaryArchive;
+
+    private String allStayAddToPay;
+    private String allGotoFixed;
     private SalaryArchiveService getSalaryArchiveService(User user) {
         return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user);
     }
@@ -55,12 +60,6 @@ public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob {
         return ServiceUtil.getService(SIArchivesServiceImpl.class, user);
     }
 
-    private String syncInsuranceArchive;
-    private String syncSalaryArchive;
-
-    private String allStayAddToPay;
-    private String allGotoFixed;
-
     private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz();
 
     private SocialSchemeMapper getSocialSchemeMapper() {
diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java
index d5bec89d0..0d9e978c3 100644
--- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java
+++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java
@@ -31,6 +31,13 @@ import java.util.*;
  */
 public class  AutoSyncResignationEmpArchiveJob extends BaseCronJob {
 
+    private String syncInsuranceArchive;
+    private String syncSalaryArchive;
+
+    private String allStayAddToPay;
+    private String allGotoFixed;
+
+
     private SalaryArchiveService getSalaryArchiveService(User user) {
         return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user);
     }
@@ -73,39 +80,43 @@ public class  AutoSyncResignationEmpArchiveJob extends BaseCronJob {
         }
         cal.add(Calendar.MONTH, preMonthValue);
         Map<Long, String> resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime()));
-        // 获取离职人员中没有设置最后发薪日期的薪资档案
-        List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
-        Date now = new Date();
-        List<SalaryArchivePO> needUpdateSalaryArchiveList = new ArrayList<>();
-        for(SalaryArchivePO archive : salaryArchivePOS){
-            String dismissDate = resignationMap.get(archive.getEmployeeId());
-            if (StringUtils.isNotBlank(dismissDate)) {
-                archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate));
-                archive.setUpdateTime(now);
-                needUpdateSalaryArchiveList.add(archive);
+
+        if (StringUtils.isBlank(syncSalaryArchive) || !StringUtils.equals(syncSalaryArchive, "false")) {
+            // 获取离职人员中没有设置最后发薪日期的薪资档案
+            List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
+            Date now = new Date();
+            List<SalaryArchivePO> needUpdateSalaryArchiveList = new ArrayList<>();
+            for(SalaryArchivePO archive : salaryArchivePOS){
+                String dismissDate = resignationMap.get(archive.getEmployeeId());
+                if (StringUtils.isNotBlank(dismissDate)) {
+                    archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate));
+                    archive.setUpdateTime(now);
+                    needUpdateSalaryArchiveList.add(archive);
+                }
+            }
+            if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) {
+                getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList);
             }
         }
-        if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) {
-            getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList);
-        }
-
-        // 获取离职人员中没有设置最后缴纳月的社保福利档案
+        if (StringUtils.isBlank(syncInsuranceArchive) || !StringUtils.equals(syncInsuranceArchive, "false")) {
+            // 获取离职人员中没有设置最后缴纳月的社保福利档案
 //        List<InsuranceArchivesBaseInfoPO> needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
-        List<InsuranceArchivesBaseInfoPO> needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
-        // 设置社保、公积金最后缴纳月
-        for(InsuranceArchivesBaseInfoPO po : needSyncList){
-            String dismissDate = resignationMap.get(po.getEmployeeId());
-            if (StringUtils.isNotEmpty(dismissDate)) {
-                dismissDate = StringUtils.substring(dismissDate,0,7);
-                // 更新社保最后缴纳月
-                Long socialArchivesId = po.getSocialArchivesId();
-                getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate);
-                // 更新公积金最后缴纳月
-                Long fundArchivesId = po.getFundArchivesId();
-                getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate);
-                // 更新企业年金及其他福利最后缴纳月
-                Long otherArchivesId = po.getOtherArchivesId();
-                getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate);
+            List<InsuranceArchivesBaseInfoPO> needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
+            // 设置社保、公积金最后缴纳月
+            for(InsuranceArchivesBaseInfoPO po : needSyncList){
+                String dismissDate = resignationMap.get(po.getEmployeeId());
+                if (StringUtils.isNotEmpty(dismissDate)) {
+                    dismissDate = StringUtils.substring(dismissDate,0,7);
+                    // 更新社保最后缴纳月
+                    Long socialArchivesId = po.getSocialArchivesId();
+                    getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate);
+                    // 更新公积金最后缴纳月
+                    Long fundArchivesId = po.getFundArchivesId();
+                    getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate);
+                    // 更新企业年金及其他福利最后缴纳月
+                    Long otherArchivesId = po.getOtherArchivesId();
+                    getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate);
+                }
             }
         }
     }

From c8f281613bec34fc4489324fc20865d014ab5cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 18 Mar 2025 17:45:00 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E6=B5=8F=E8=A7=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A4=9A=E9=80=89=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryStatisticsEmployeeSalaryQueryParam.java    | 3 +++
 .../service/impl/SalaryStatisticsEmployeeServiceImpl.java  | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
index a1dbab11b..a5d6b0253 100644
--- a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
+++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
@@ -25,6 +25,9 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam {
     // 关键字
     private String keyword;
 
+    //人员ids
+    private List<Long> employeeIds;
+
     // 起始年月
     private String startDateStr;
     private Date startDate;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 2e49c8353..2267440fc 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -344,6 +344,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
             List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());
             salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
         }
+
+        //人员浏览按钮筛选
+        List<Long> employeeIds = queryParam.getEmployeeIds();
+        if(CollectionUtils.isNotEmpty(employeeIds)){
+            salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
+        }
+
         if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
             return new PageInfo<>();
         }

From 47dbfeb8dbdb9aac3038e483797cc0d70a076c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 15:26:06 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DeductionAmountDTO.java               |   1 +
 .../param/DeductionAmountFeedBackParam.java   |   6 +-
 .../deductionamount/po/DeductionAmountPO.java |  18 +-
 .../po/DeductionAmountRecordPO.java           |  66 +++++
 .../deductionamount/DeductionAmountMapper.xml |  15 ++
 .../DeductionAmountRecordMapper.java          |  77 ++++++
 .../DeductionAmountRecordMapper.xml           | 239 ++++++++++++++++++
 .../tax/client/DeductionAmountClient.java     |  35 ++-
 .../ConfirmFeedbackResponse.java              |  75 ++++++
 .../service/DeductionAmountService.java       |   4 +-
 .../impl/DeductionAmountServiceImpl.java      | 166 +++++++-----
 .../impl/EmployeeDeclareServiceImpl.java      |   2 -
 .../salary/web/DeductionAmountController.java |   4 +-
 .../wrapper/DeductionAmountWrapper.java       |   6 +-
 14 files changed, 619 insertions(+), 95 deletions(-)
 create mode 100644 src/com/engine/salary/entity/deductionamount/po/DeductionAmountRecordPO.java
 create mode 100644 src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.java
 create mode 100644 src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.xml
 create mode 100644 src/com/engine/salary/remote/tax/response/deductionAmount/ConfirmFeedbackResponse.java

diff --git a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
index d5a2d3fcb..43fc7de83 100644
--- a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
+++ b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
@@ -85,6 +85,7 @@ public class DeductionAmountDTO {
      */
     @TableTitle(title = "报送状态", dataIndex = "declareStatus", key = "declareStatus")
     private Integer declareStatus;
+    private String declareErrorMsg;
 
 
     /**
diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java
index 9cd7ad6f5..111c7011e 100644
--- a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountFeedBackParam.java
@@ -24,7 +24,7 @@ public class DeductionAmountFeedBackParam {
     @DataCheck(require = true, message = "参数错误，个税扣缴义务人id不能为空")
     private Long taxAgentId;
 
-    @DataCheck(require = true, message = "参数错误，requestId不能为空")
-    private String requestId;
-
+    // 税款所属年度
+    @DataCheck(require = true, message = "参数错误，税款所属年度参数格式错误")
+    private String year;
 }
diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
index 731a211da..e203655e7 100644
--- a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
@@ -79,12 +79,6 @@ public class DeductionAmountPO {
     @ElogTransform(name = "证件类型")
     private Integer cardType;
 
-    /**
-     * 报送状态
-     */
-    @ElogTransform(name = "报送状态")
-    private Integer declareStatus;
-
     /**
      * 是否扣除
      */
@@ -96,6 +90,18 @@ public class DeductionAmountPO {
     @ElogTransform(name = "是否成功报送过")
     private Integer successfullyDeclared;
 
+    /**
+     * 报送状态
+     */
+    @ElogTransform(name = "报送状态")
+    private Integer declareStatus;
+
+    /**
+     * 申报失败的错误信息
+     */
+    @ElogTransform(name = "失败的错误信息")
+    private String declareErrorMsg;
+
 
     /**
      * 创建时间
diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountRecordPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountRecordPO.java
new file mode 100644
index 000000000..f476627f1
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountRecordPO.java
@@ -0,0 +1,66 @@
+package com.engine.salary.entity.deductionamount.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 扣减报送记录
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+//"hrsa_employee_declare_record")
+public class DeductionAmountRecordPO {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+    /**
+     * 个税扣缴义务人
+     */
+    private Long taxAgentId;
+    /**
+     * 税款所属年
+     */
+    private String year;
+    /**
+     * 请求的requestId
+     */
+    private String requestId;
+    /**
+     * 租户key
+     */
+    private String tenantKey;
+    /**
+     * 创建人id
+     */
+    private Long creator;
+    /**
+     * 是否删除
+     */
+    private Integer deleteType;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private Collection<Long> ids;
+}
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
index db85a9649..023a41f81 100644
--- a/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountMapper.xml
@@ -15,6 +15,7 @@
         <result column="id" property="id"/>
         <result column="job_num" property="jobNum"/>
         <result column="successfully_declared" property="successfullyDeclared"/>
+        <result column="declare_error_msg" property="declareErrorMsg"/>
         <result column="tax_agent_id" property="taxAgentId"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
@@ -39,6 +40,7 @@
         , t.id
         , t.job_num
         , t.successfully_declared
+        , t.declare_error_msg
         , t.tax_agent_id
         , t.tenant_key
         , t.update_time
@@ -108,6 +110,9 @@
         <if test="successfullyDeclared != null">
             AND successfully_declared = #{successfullyDeclared}
         </if>
+        <if test="declareErrorMsg != null">
+            AND declare_error_msg = #{declareErrorMsg}
+        </if>
         <if test="taxAgentId != null">
             AND tax_agent_id = #{taxAgentId}
         </if>
@@ -177,6 +182,9 @@
             <if test="successfullyDeclared != null">
                 successfully_declared,
             </if>
+            <if test="declareErrorMsg != null">
+                declare_error_msg,
+            </if>
             <if test="taxAgentId != null">
                 tax_agent_id,
             </if>
@@ -233,6 +241,9 @@
             <if test="successfullyDeclared != null">
                 #{successfullyDeclared},
             </if>
+            <if test="declareErrorMsg != null">
+                #{declareErrorMsg},
+            </if>
             <if test="taxAgentId != null">
                 #{taxAgentId},
             </if>
@@ -268,6 +279,7 @@
             employee_type=#{employeeType},
             job_num=#{jobNum},
             successfully_declared=#{successfullyDeclared},
+            declare_error_msg=#{declareErrorMsg},
             tax_agent_id=#{taxAgentId},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
@@ -318,6 +330,9 @@
             <if test="successfullyDeclared != null">
                 successfully_declared=#{successfullyDeclared},
             </if>
+            <if test="declareErrorMsg != null">
+                declare_error_msg=#{declareErrorMsg},
+            </if>
             <if test="taxAgentId != null">
                 tax_agent_id=#{taxAgentId},
             </if>
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.java b/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.java
new file mode 100644
index 000000000..ca2815680
--- /dev/null
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.java
@@ -0,0 +1,77 @@
+package com.engine.salary.mapper.deductionamount;
+
+import com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface DeductionAmountRecordMapper {
+
+	/**
+     * 查询所有记录
+     *
+     * @return 返回集合，没有返回空List
+     */
+	List<DeductionAmountRecordPO> listAll();
+    
+    /**
+     * 条件查询
+     *
+     * @return 返回集合，没有返回空List
+     */
+    List<DeductionAmountRecordPO> listSome(DeductionAmountRecordPO deductionAmountRecord);
+    
+
+	/**
+     * 根据主键查询
+     *
+     * @param id 主键
+     * @return 返回记录，没有返回null
+     */
+	DeductionAmountRecordPO getById(Long id);
+
+
+	DeductionAmountRecordPO getByTaxAgentIdAndYear(@Param("taxAgentId")Long taxAgentId,@Param("year") String year);
+	
+	/**
+     * 新增，忽略null字段
+     *
+     * @param deductionAmountRecord 新增的记录
+     * @return 返回影响行数
+     */
+	int insertIgnoreNull(DeductionAmountRecordPO deductionAmountRecord);
+
+	/**
+     * 修改，修改所有字段
+     *
+     * @param deductionAmountRecord 修改的记录
+     * @return 返回影响行数
+     */
+	int update(DeductionAmountRecordPO deductionAmountRecord);
+	
+	/**
+     * 修改，忽略null字段
+     *
+     * @param deductionAmountRecord 修改的记录
+     * @return 返回影响行数
+     */
+	int updateIgnoreNull(DeductionAmountRecordPO deductionAmountRecord);
+	
+	/**
+     * 删除记录
+     *
+     * @param deductionAmountRecord 待删除的记录
+     * @return 返回影响行数
+     */
+	int delete(DeductionAmountRecordPO deductionAmountRecord);
+    
+    /**
+     * 批量删除记录
+     * @param ids 主键id集合
+     */
+    void deleteByIds(@Param("ids") Collection<Long> ids);
+
+    void deleteByTaxAgentIdAndYear(@Param("taxAgentId")Long taxAgentId,@Param("year") String year);
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.xml b/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.xml
new file mode 100644
index 000000000..930371420
--- /dev/null
+++ b/src/com/engine/salary/mapper/deductionamount/DeductionAmountRecordMapper.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.engine.salary.mapper.deductionamount.DeductionAmountRecordMapper">
+    <resultMap id="BaseResultMap" type="com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO">
+        <result column="create_time" property="createTime"/>
+        <result column="creator" property="creator"/>
+        <result column="delete_type" property="deleteType"/>
+        <result column="id" property="id"/>
+        <result column="request_id" property="requestId"/>
+        <result column="tax_agent_id" property="taxAgentId"/>
+        <result column="tenant_key" property="tenantKey"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="year" property="year"/>
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        t
+        .
+        create_time
+        , t.creator
+        , t.delete_type
+        , t.id
+        , t.request_id
+        , t.tax_agent_id
+        , t.tenant_key
+        , t.update_time
+        , t.year
+    </sql>
+
+    <!-- 查询全部 -->
+    <select id="listAll" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount_record t
+        WHERE delete_type = 0
+    </select>
+
+    <!-- 根据主键获取单条记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="Long">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount_record t
+        WHERE id = #{id} AND delete_type = 0
+    </select>
+
+    <select id="getByTaxAgentIdAndYear" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount_record t
+        WHERE  delete_type = 0
+        AND  tax_agent_id=#{taxAgentId}
+        AND  year=#{year}
+    </select>
+
+    <!-- 条件查询 -->
+    <select id="listSome" resultMap="BaseResultMap"
+            parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_deduction_amount_record t
+        WHERE delete_type = 0
+        <if test="createTime != null">
+            AND create_time = #{createTime}
+        </if>
+        <if test="creator != null">
+            AND creator = #{creator}
+        </if>
+        <if test="deleteType != null">
+            AND delete_type = #{deleteType}
+        </if>
+        <if test="id != null">
+            AND id = #{id}
+        </if>
+        <if test="requestId != null">
+            AND request_id = #{requestId}
+        </if>
+        <if test="taxAgentId != null">
+            AND tax_agent_id = #{taxAgentId}
+        </if>
+        <if test="tenantKey != null">
+            AND tenant_key = #{tenantKey}
+        </if>
+        <if test="updateTime != null">
+            AND update_time = #{updateTime}
+        </if>
+        <if test="year != null">
+            AND year = #{year}
+        </if>
+        <if test="ids != null and ids.size()>0">
+            AND id IN
+            <foreach collection="ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY id DESC
+    </select>
+
+
+    <!-- 插入不为NULL的字段 -->
+    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO">
+        INSERT INTO hrsa_deduction_amount_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="id != null">
+                id,
+            </if>
+            <if test="requestId != null">
+                request_id,
+            </if>
+            <if test="taxAgentId != null">
+                tax_agent_id,
+            </if>
+            <if test="tenantKey != null">
+                tenant_key,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="year != null">
+                year,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="id != null">
+                #{id},
+            </if>
+            <if test="requestId != null">
+                #{requestId},
+            </if>
+            <if test="taxAgentId != null">
+                #{taxAgentId},
+            </if>
+            <if test="tenantKey != null">
+                #{tenantKey},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="year != null">
+                #{year},
+            </if>
+        </trim>
+    </insert>
+
+    <!-- 更新,更新全部字段 -->
+    <update id="update" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO">
+        UPDATE hrsa_deduction_amount_record
+        <set>
+            create_time=#{createTime},
+            creator=#{creator},
+            delete_type=#{deleteType},
+            request_id=#{requestId},
+            tax_agent_id=#{taxAgentId},
+            tenant_key=#{tenantKey},
+            update_time=#{updateTime},
+            year=#{year},
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+
+    <!-- 更新不为NULL的字段 -->
+    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO">
+        UPDATE hrsa_deduction_amount_record
+        <set>
+            <if test="createTime != null">
+                create_time=#{createTime},
+            </if>
+            <if test="creator != null">
+                creator=#{creator},
+            </if>
+            <if test="deleteType != null">
+                delete_type=#{deleteType},
+            </if>
+            <if test="requestId != null">
+                request_id=#{requestId},
+            </if>
+            <if test="taxAgentId != null">
+                tax_agent_id=#{taxAgentId},
+            </if>
+            <if test="tenantKey != null">
+                tenant_key=#{tenantKey},
+            </if>
+            <if test="updateTime != null">
+                update_time=#{updateTime},
+            </if>
+            <if test="year != null">
+                year=#{year},
+            </if>
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+
+    <!-- 根据主键删除记录 -->
+    <delete id="delete">
+        UPDATE hrsa_deduction_amount_record
+        SET delete_type=1
+        WHERE id = #{id}
+          AND delete_type = 0
+    </delete>
+
+    <delete id="deleteByIds">
+        UPDATE hrsa_deduction_amount_record
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteByTaxAgentIdAndYear">
+        UPDATE hrsa_deduction_amount_record
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND  tax_agent_id=#{taxAgentId}
+        AND  year=#{year}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
index 2eb13159d..05c3d3482 100644
--- a/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
+++ b/src/com/engine/salary/remote/tax/client/DeductionAmountClient.java
@@ -3,11 +3,14 @@ package com.engine.salary.remote.tax.client;
 import com.engine.salary.enums.taxagent.TaxAgentTaxReturnPasswordTypeEnum;
 import com.engine.salary.remote.tax.request.deductionAmount.ConfirmPreDeductRequest;
 import com.engine.salary.remote.tax.request.deductionAmount.QueryDeductionAmountRequest;
+import com.engine.salary.remote.tax.response.deductionAmount.ConfirmFeedbackResponse;
 import com.engine.salary.util.HttpUtil;
 import com.engine.salary.util.JsonUtil;
 import com.engine.salary.util.SingnatureData;
+import com.engine.salary.util.TaskUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import weaver.general.Util;
 
 import java.util.*;
 
@@ -57,7 +60,7 @@ public class DeductionAmountClient extends TaxBaseClient {
     }
 
 
-    public String confirm(String year, List<ConfirmPreDeductRequest.kczg> kczglb ) {
+    public String confirm(String year, List<ConfirmPreDeductRequest.kczg> kczglb) {
 
         String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/confirmPreDeduct";
         ConfirmPreDeductRequest request = new ConfirmPreDeductRequest();
@@ -77,26 +80,22 @@ public class DeductionAmountClient extends TaxBaseClient {
         request.setSkssnd(year);
         request.setKczglb(kczglb);
 
-        String reqJson = JsonUtil.toJsonString(request);
-        log.info("confirmPreDeduct params --- \n{}\n", reqJson);
-        Map<String, String> params = new HashMap<>(1);
-        Map<String, String> header = SingnatureData.initHeader(params, apiConfig.getAppKey(), apiConfig.getAppSecret());
-
-        //  开始请求
-        String res = HttpUtil.doPost(url, header, reqJson, HttpUtil.JSON_TYPE);
-        log.info("confirmPreDeduct res --- {}", res);
-        return res;
+        String requestId = request(url, JsonUtil.parseMap(request, Object.class));
+        return requestId;
     }
 
-    public String feedback(String requestId) {
+    public ConfirmFeedbackResponse feedback(String requestId) {
+        TaskUtil taskUtil = new TaskUtil();
+
         String url = super.apiConfig.getHost() + "gateway/iit/deductionAmount/getPreDeductConfirmFeedback";
 
-        Map<String, String> params = new HashMap<>(1);
-        params.put("requestId", requestId);
-        log.info("getPreDeductConfirmFeedback requestId --- \n{}\n", requestId);
-        Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
-        String res = HttpUtil.getRequest(url, header, params);
-        log.info("getPreDeductConfirmFeedback res --- {}", res);
-        return res;
+        Map<String, String> param = new HashMap<>(1);
+        param.put("requestId", requestId);
+
+        Map<String, String> header = SingnatureData.initHeader(new HashMap<>(1), apiConfig.getAppKey(), apiConfig.getAppSecret());
+        String res = HttpUtil.getRequest(url, header, param);
+        taskUtil.writeApiTaskRecord(Util.null2String(taxAgentId), url, JsonUtil.toJsonString(param), res);
+        ConfirmFeedbackResponse response = JsonUtil.parseBean(res, ConfirmFeedbackResponse.class);
+        return response;
     }
 }
diff --git a/src/com/engine/salary/remote/tax/response/deductionAmount/ConfirmFeedbackResponse.java b/src/com/engine/salary/remote/tax/response/deductionAmount/ConfirmFeedbackResponse.java
new file mode 100644
index 000000000..783f5f359
--- /dev/null
+++ b/src/com/engine/salary/remote/tax/response/deductionAmount/ConfirmFeedbackResponse.java
@@ -0,0 +1,75 @@
+package com.engine.salary.remote.tax.response.deductionAmount;
+
+import com.engine.salary.entity.taxpayment.response.BaseResponse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 扣除名单确认反馈
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ConfirmFeedbackResponse extends BaseResponse {
+
+    /**
+     * 返回数据
+     */
+    private Body body;
+
+    /**
+     * 神州云合接口返回状态实体类
+     **/
+    @Data
+    public static class Body {
+
+        /**
+         * 总人数
+         */
+        private String zrs;
+        /**
+         * 成功人数
+         */
+        private String cgrs;
+        /**
+         * 失败人数
+         */
+        private String sbrs;
+        /**
+         * 扣除确认失败列表
+         */
+        private List<kcqrsb> kcqrsblb;
+
+        @Data
+        public static class kcqrsb {
+
+            /**
+             * 姓名
+             */
+            private String xm;
+            /**
+             * 证件类型        见证件类型字典
+             */
+            private String zzlx;
+            /**
+             * 证件号码        证件号码
+             */
+            private String zzhm;
+            /**
+             * 国籍
+             */
+            private String gj;
+            /**
+             * 失败原因
+             */
+            private String sbyy;
+        }
+    }
+
+}
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
index 7d8b49879..3d7da8fad 100644
--- a/src/com/engine/salary/service/DeductionAmountService.java
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -22,7 +22,7 @@ public interface DeductionAmountService {
 
     Object query(DeductionAmountOnlineQueryParam param);
 
-    Object confirm(DeductionAmountConfirmParam param);
+    String confirm(DeductionAmountConfirmParam param);
 
-    void feedback(DeductionAmountFeedBackParam param);
+    String feedback(DeductionAmountFeedBackParam param);
 }
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index 4855fd950..5b30ff10d 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -2,32 +2,38 @@ package com.engine.salary.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
-import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.component.PageInfo;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
+import com.engine.salary.constant.SzyhApiConstant;
 import com.engine.salary.entity.deductionamount.dto.DeductionAmountDTO;
 import com.engine.salary.entity.deductionamount.param.*;
 import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
+import com.engine.salary.entity.deductionamount.po.DeductionAmountRecordPO;
 import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
 import com.engine.salary.enums.SalaryOnOffEnum;
 import com.engine.salary.enums.employeedeclare.CardTypeEnum;
+import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
+import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.deductionamount.DeductionAmountMapper;
+import com.engine.salary.mapper.deductionamount.DeductionAmountRecordMapper;
 import com.engine.salary.mapper.employeedeclare.EmployeeDeclareMapper;
 import com.engine.salary.remote.tax.client.DeductionAmountClient;
 import com.engine.salary.remote.tax.request.deductionAmount.ConfirmPreDeductRequest;
-import com.engine.salary.service.*;
+import com.engine.salary.remote.tax.response.deductionAmount.ConfirmFeedbackResponse;
+import com.engine.salary.service.DeductionAmountService;
 import com.engine.salary.util.SalaryEntityUtil;
+import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.SalaryPageUtil;
 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.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -41,6 +47,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public class DeductionAmountServiceImpl extends Service implements DeductionAmountService {
 
+    private DeductionAmountRecordMapper getDeductionAmountRecordMapper() {
+        return MapperProxyFactory.getProxy(DeductionAmountRecordMapper.class);
+    }
+
     private DeductionAmountMapper getDeductionAmountMapper() {
         return MapperProxyFactory.getProxy(DeductionAmountMapper.class);
     }
@@ -49,34 +59,6 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
         return MapperProxyFactory.getProxy(EmployeeDeclareMapper.class);
     }
 
-    private TaxAgentService getTaxAgentService(User user) {
-        return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
-    }
-
-    private SalaryEmployeeService getSalaryEmployeeService(User user) {
-        return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
-    }
-
-    private SalaryArchiveService getSalaryArchiveService(User user) {
-        return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user);
-    }
-
-    private TaxDeclarationApiConfigService getTaxDeclarationApiConfigService(User user) {
-        return ServiceUtil.getService(TaxDeclarationApiConfigServiceImpl.class, user);
-    }
-
-    private TaxAgentTaxReturnService getTaxAgentTaxReturnService(User user) {
-        return ServiceUtil.getService(TaxAgentTaxReturnServiceImpl.class, user);
-    }
-
-    private EmployeeDeclareRecordService getEmployeeDeclareRecordService(User user) {
-        return ServiceUtil.getService(EmployeeDeclareRecordServiceImpl.class, user);
-    }
-
-    private TaxDeclarationApiBillingService getTaxDeclarationApiBillingService(User user) {
-        return ServiceUtil.getService(TaxDeclarationApiBillingServiceImpl.class, user);
-    }
-
 
     @Override
     public PageInfo<DeductionAmountDTO> list(DeductionAmountListParam param) {
@@ -84,26 +66,27 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
 
         List<DeductionAmountPO> deductionAmountPOS = getDeductionAmountMapper().listSome(DeductionAmountPO.builder().year(param.getYear()).taxAgentId(param.getTaxAgentId()).build());
 
-        List<DeductionAmountDTO> list = deductionAmountPOS.stream().map(deductionAmountPO -> {
-            return DeductionAmountDTO.builder()
-                    .id(deductionAmountPO.getId())
-                    .taxAgentId(deductionAmountPO.getEmployeeId())
-                    .year(deductionAmountPO.getYear())
-                    .employeeId(deductionAmountPO.getEmployeeId())
-                    .employeeName(deductionAmountPO.getEmployeeName())
-                    .employeeType(deductionAmountPO.getEmployeeType())
-                    .jobNum(deductionAmountPO.getJobNum())
-                    .nationality(deductionAmountPO.getNationality())
-                    .cardNum(deductionAmountPO.getCardNum())
-                    .cardType(deductionAmountPO.getCardType())
-                    .declareStatus(deductionAmountPO.getDeclareStatus())
-                    .deductFlag(deductionAmountPO.getDeductFlag())
-                    .successfullyDeclared(deductionAmountPO.getSuccessfullyDeclared())
-                    .creator(deductionAmountPO.getCreator())
-                    .createTime(deductionAmountPO.getCreateTime())
-                    .updateTime(deductionAmountPO.getUpdateTime())
-                    .build();
-        }).collect(Collectors.toList());
+        List<DeductionAmountDTO> list = deductionAmountPOS.stream()
+                .map(deductionAmountPO -> DeductionAmountDTO.builder()
+                        .id(deductionAmountPO.getId())
+                        .taxAgentId(deductionAmountPO.getEmployeeId())
+                        .year(deductionAmountPO.getYear())
+                        .employeeId(deductionAmountPO.getEmployeeId())
+                        .employeeName(deductionAmountPO.getEmployeeName())
+                        .employeeType(deductionAmountPO.getEmployeeType())
+                        .jobNum(deductionAmountPO.getJobNum())
+                        .nationality(deductionAmountPO.getNationality())
+                        .cardNum(deductionAmountPO.getCardNum())
+                        .cardType(deductionAmountPO.getCardType())
+                        .declareStatus(deductionAmountPO.getDeclareStatus())
+                        .declareErrorMsg(deductionAmountPO.getDeclareErrorMsg())
+                        .deductFlag(deductionAmountPO.getDeductFlag())
+                        .successfullyDeclared(deductionAmountPO.getSuccessfullyDeclared())
+                        .creator(deductionAmountPO.getCreator())
+                        .createTime(deductionAmountPO.getCreateTime())
+                        .updateTime(deductionAmountPO.getUpdateTime())
+                        .build())
+                .collect(Collectors.toList());
 
         return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, DeductionAmountDTO.class);
     }
@@ -134,9 +117,9 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                         .cardNum(employeeDeclarePO.getCardNum())
                         .cardType(employeeDeclarePO.getCardType())
                         .nationality(employeeDeclarePO.getNationality())
-                        .declareStatus(0)
-                        .deductFlag(1)
-                        .successfullyDeclared(0)
+                        .declareStatus(DeclareStatusEnum.NOT_DECLARE.getValue())
+                        .deductFlag(SalaryOnOffEnum.OFF.getValue())
+                        .successfullyDeclared(SalaryOnOffEnum.OFF.getValue())
                         .creator((long) user.getUID())
                         .createTime(now)
                         .updateTime(now)
@@ -164,7 +147,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
     }
 
     @Override
-    public Object confirm(DeductionAmountConfirmParam param) {
+    public String confirm(DeductionAmountConfirmParam param) {
         ValidUtil.doValidator(param);
         Long taxAgentId = param.getTaxAgentId();
         String year = param.getYear();
@@ -181,13 +164,78 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                 }).collect(Collectors.toList());
 
         DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
-        return deductionAmountClient.confirm(year, kczglb);
+        String requestId = deductionAmountClient.confirm(year, kczglb);
+
+        //更新状态
+        deductionAmountPOS.forEach(deductionAmountPO -> {
+            deductionAmountPO.setDeclareStatus(DeclareStatusEnum.DECLARING.getValue());
+            getDeductionAmountMapper().updateIgnoreNull(deductionAmountPO);
+        });
+
+        //插入记录
+        getDeductionAmountRecordMapper().deleteByTaxAgentIdAndYear(taxAgentId, year);
+        DeductionAmountRecordPO recordPO = DeductionAmountRecordPO.builder()
+                .id(IdGenerator.generate())
+                .taxAgentId(taxAgentId)
+                .year(year)
+                .requestId(requestId)
+                .creator((long) user.getUID())
+                .createTime(new Date())
+                .updateTime(new Date())
+                .deleteType(NumberUtils.INTEGER_ZERO)
+                .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                .build();
+        getDeductionAmountRecordMapper().insertIgnoreNull(recordPO);
+
+        return requestId;
     }
 
     @Override
-    public void feedback(DeductionAmountFeedBackParam param) {
-        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(param.getTaxAgentId());
-        String feedback = deductionAmountClient.feedback(param.getRequestId());
+    public String feedback(DeductionAmountFeedBackParam param) {
+        Long taxAgentId = param.getTaxAgentId();
+        String year = param.getYear();
+        DeductionAmountRecordPO recordPO = getDeductionAmountRecordMapper().getByTaxAgentIdAndYear(taxAgentId, year);
+
+        if (recordPO == null) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175337, "请先点击报送扣除名单，再点击反馈"));
+        }
+
+        String requestId = recordPO.getRequestId();
+        DeductionAmountClient deductionAmountClient = new DeductionAmountClient(taxAgentId);
+        ConfirmFeedbackResponse feedback = deductionAmountClient.feedback(requestId);
+
+        if (feedback == null || feedback.getHead() == null) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(95828, "服务异常，请稍后重试"));
+        }
+        //  如果税友返回错误信息
+        String code = feedback.getHead().getCode();
+        if (SzyhApiConstant.HANDLING_CODE.equals(code) || SzyhApiConstant.TASK_HANDLING_CODE.equals(code)) {
+            //进行中的任务，重试
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175337, "任务还在处理中，请稍后点击反馈"));
+        }
+
+        if (!SzyhApiConstant.SUCCESS_CODE.equals(code)) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(95828, feedback.getHead().getMsg()));
+        }
+
+        List<DeductionAmountPO> deductionAmountPOS = getDeductionAmountMapper().listSome(DeductionAmountPO.builder().taxAgentId(taxAgentId).year(year).build());
+
+        List<ConfirmFeedbackResponse.Body.kcqrsb> kcqrsblb = feedback.getBody().getKcqrsblb();
+        Map<String, String> failMap = SalaryEntityUtil.convert2Map(kcqrsblb, ConfirmFeedbackResponse.Body.kcqrsb::getZzhm, ConfirmFeedbackResponse.Body.kcqrsb::getSbyy);
+
+        deductionAmountPOS.forEach(deductionAmountPO -> {
+            String cardNum = deductionAmountPO.getCardNum();
+            if (failMap.containsKey(cardNum)) {
+                deductionAmountPO.setDeclareStatus(DeclareStatusEnum.DECLARE_FAIL.getValue());
+                deductionAmountPO.setDeclareErrorMsg(failMap.get(cardNum));
+            } else {
+                deductionAmountPO.setDeclareStatus(DeclareStatusEnum.DECLARE_SUCCESS.getValue());
+                deductionAmountPO.setSuccessfullyDeclared(SalaryOnOffEnum.ON.getValue());
+            }
+            getDeductionAmountMapper().updateIgnoreNull(deductionAmountPO);
+        });
+
+        return String.format("成功%s条，失败%s条", feedback.getBody().getCgrs(), feedback.getBody().getSbrs());
 
     }
 }
diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
index 643d210ca..7e7da0c23 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
@@ -706,9 +706,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
         }
         // 更新员工的报送状态
         if (CollectionUtils.isNotEmpty(needUpdateEmployeeDeclares)) {
-            //todo
             needUpdateEmployeeDeclares.forEach(getEmployeeDeclareMapper()::updateIgnoreNull);
-//            updateBatchById(needUpdateEmployeeDeclares);
         }
         // 删除原来的人员报送记录
         getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId());
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
index b900b6872..3657d6f83 100644
--- a/src/com/engine/salary/web/DeductionAmountController.java
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -72,7 +72,7 @@ public class DeductionAmountController {
     @Produces(MediaType.APPLICATION_JSON)
     public String confirm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountConfirmParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<DeductionAmountConfirmParam, Object>(user).run(getDeductionAmountWrapper(user)::confirm, param);
+        return new ResponseResult<DeductionAmountConfirmParam, String>(user).run(getDeductionAmountWrapper(user)::confirm, param);
     }
 
     @POST
@@ -80,7 +80,7 @@ public class DeductionAmountController {
     @Produces(MediaType.APPLICATION_JSON)
     public String feedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountFeedBackParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<DeductionAmountFeedBackParam, Object>(user).run(getDeductionAmountWrapper(user)::feedback, param);
+        return new ResponseResult<DeductionAmountFeedBackParam, String>(user).run(getDeductionAmountWrapper(user)::feedback, param);
     }
 
 }
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
index 7a474421f..a4f0628e9 100644
--- a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -40,11 +40,11 @@ public class DeductionAmountWrapper extends Service {
         return getDeductionAmountService(user).query(param);
     }
 
-    public Object confirm(DeductionAmountConfirmParam param) {
+    public String confirm(DeductionAmountConfirmParam param) {
         return getDeductionAmountService(user).confirm(param);
     }
 
-    public void feedback(DeductionAmountFeedBackParam param) {
-        getDeductionAmountService(user).feedback(param);
+    public String feedback(DeductionAmountFeedBackParam param) {
+       return getDeductionAmountService(user).feedback(param);
     }
 }

From 10f1ec1629280b9754d58427becd62359d45c9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 16:03:12 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8D=E5=8D=95sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/DM/sql202503190103.sql    | 38 +++++++++++++++++++
 resource/sqlupgrade/GS/sql202503190103.sql    | 38 +++++++++++++++++++
 resource/sqlupgrade/JC/sql202503190103.sql    | 38 +++++++++++++++++++
 resource/sqlupgrade/Mysql/sql202503190103.sql | 37 ++++++++++++++++++
 .../sqlupgrade/Oracle/sql202503190103.sql     | 37 ++++++++++++++++++
 resource/sqlupgrade/PG/sql202503190103.sql    | 37 ++++++++++++++++++
 .../sqlupgrade/SQLServer/sql202503190103.sql  | 37 ++++++++++++++++++
 resource/sqlupgrade/ST/sql202503190103.sql    | 38 +++++++++++++++++++
 8 files changed, 300 insertions(+)
 create mode 100644 resource/sqlupgrade/DM/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/GS/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/JC/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/Mysql/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/Oracle/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/PG/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/SQLServer/sql202503190103.sql
 create mode 100644 resource/sqlupgrade/ST/sql202503190103.sql

diff --git a/resource/sqlupgrade/DM/sql202503190103.sql b/resource/sqlupgrade/DM/sql202503190103.sql
new file mode 100644
index 000000000..9940e3121
--- /dev/null
+++ b/resource/sqlupgrade/DM/sql202503190103.sql
@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+
diff --git a/resource/sqlupgrade/GS/sql202503190103.sql b/resource/sqlupgrade/GS/sql202503190103.sql
new file mode 100644
index 000000000..9940e3121
--- /dev/null
+++ b/resource/sqlupgrade/GS/sql202503190103.sql
@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+
diff --git a/resource/sqlupgrade/JC/sql202503190103.sql b/resource/sqlupgrade/JC/sql202503190103.sql
new file mode 100644
index 000000000..9940e3121
--- /dev/null
+++ b/resource/sqlupgrade/JC/sql202503190103.sql
@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+
diff --git a/resource/sqlupgrade/Mysql/sql202503190103.sql b/resource/sqlupgrade/Mysql/sql202503190103.sql
new file mode 100644
index 000000000..6c78f00ed
--- /dev/null
+++ b/resource/sqlupgrade/Mysql/sql202503190103.sql
@@ -0,0 +1,37 @@
+CREATE TABLE hrsa_deduction_amount
+(
+    id                    bigint(0),
+    create_time           datetime(0),
+    update_time           datetime(0),
+    creator               bigint(0),
+    delete_type           int(0),
+    tenant_key            varchar(10),
+    tax_agent_id          bigint(0),
+    year                  varchar(100),
+    employee_id           bigint(0),
+    employee_type         tinyint(0),
+    employee_name         varchar(100),
+    job_num               varchar(100),
+    card_type             tinyint(0),
+    card_num              varchar(100),
+    nationality           varchar(200),
+    deduct_flag           tinyint(0),
+    successfully_declared tinyint(0),
+    declare_status        tinyint(0),
+    declare_error_msg     varchar(3000),
+    PRIMARY KEY (id) USING BTREE
+);
+
+CREATE TABLE hrsa_deduction_amount_record
+(
+    id           bigint(0),
+    create_time  datetime(0),
+    update_time  datetime(0),
+    creator      bigint(0),
+    delete_type  int(0),
+    tenant_key   varchar(10),
+    tax_agent_id bigint(0),
+    year         varchar(255),
+    request_id   varchar(100),
+    PRIMARY KEY (id) USING BTREE
+);
diff --git a/resource/sqlupgrade/Oracle/sql202503190103.sql b/resource/sqlupgrade/Oracle/sql202503190103.sql
new file mode 100644
index 000000000..172207806
--- /dev/null
+++ b/resource/sqlupgrade/Oracle/sql202503190103.sql
@@ -0,0 +1,37 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+)
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+)
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202503190103.sql b/resource/sqlupgrade/PG/sql202503190103.sql
new file mode 100644
index 000000000..7f39dcf84
--- /dev/null
+++ b/resource/sqlupgrade/PG/sql202503190103.sql
@@ -0,0 +1,37 @@
+create table hrsa_deduction_amount
+(
+    id bigint primary key ,
+    create_time timestamp,
+    update_time timestamp,
+    creator bigint,
+    delete_type int,
+    tenant_key varchar(10),
+    tax_agent_id bigint,
+    year varchar(100),
+    employee_id bigint,
+    employee_type smallint,
+    employee_name varchar(100),
+    job_num varchar(100),
+    card_type smallint,
+    card_num varchar(100),
+    nationality varchar(200),
+    deduct_flag smallint,
+    successfully_declared smallint,
+    declare_status smallint,
+    declare_error_msg varchar(3000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id bigint primary key ,
+    create_time timestamp,
+    update_time timestamp,
+    creator bigint,
+    delete_type int default 0,
+    tenant_key varchar(10),
+    tax_agent_id bigint,
+    year varchar(100),
+    request_id varchar(100)
+);
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202503190103.sql b/resource/sqlupgrade/SQLServer/sql202503190103.sql
new file mode 100644
index 000000000..3aaee1960
--- /dev/null
+++ b/resource/sqlupgrade/SQLServer/sql202503190103.sql
@@ -0,0 +1,37 @@
+create table hrsa_deduction_amount
+(
+    id bigint primary key ,
+    create_time datetime,
+    update_time datetime,
+    creator bigint,
+    delete_type int,
+    tenant_key nvarchar(10),
+    tax_agent_id bigint,
+    year nvarchar(100),
+    employee_id bigint,
+    employee_type tinyint,
+    employee_name nvarchar(100),
+    job_num nvarchar(100),
+    card_type tinyint,
+    card_num nvarchar(100),
+    nationality nvarchar(255),
+    deduct_flag tinyint,
+    successfully_declared tinyint,
+    declare_status tinyint,
+    declare_error_msg nvarchar(3000)
+)
+GO
+
+create table hrsa_deduction_amount_record
+(
+    id bigint primary key ,
+    create_time datetime,
+    update_time datetime,
+    creator bigint,
+    delete_type int,
+    tenant_key nvarchar(10),
+    tax_agent_id bigint,
+    year nvarchar(100),
+    request_id nvarchar(100)
+)
+GO
\ No newline at end of file
diff --git a/resource/sqlupgrade/ST/sql202503190103.sql b/resource/sqlupgrade/ST/sql202503190103.sql
new file mode 100644
index 000000000..9940e3121
--- /dev/null
+++ b/resource/sqlupgrade/ST/sql202503190103.sql
@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+

From d7702d7caeb76c126a56f3842a15188fafaa48e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 16:25:42 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E6=89=A3=E9=99=A4=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/DeductionAmountEditParam.java       | 30 +++++++++++++++++++
 .../deductionamount/po/DeductionAmountPO.java |  2 +-
 .../service/DeductionAmountService.java       |  2 ++
 .../impl/DeductionAmountServiceImpl.java      | 13 ++++++++
 .../salary/web/DeductionAmountController.java |  8 +++++
 .../wrapper/DeductionAmountWrapper.java       |  5 ++++
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/com/engine/salary/entity/deductionamount/param/DeductionAmountEditParam.java

diff --git a/src/com/engine/salary/entity/deductionamount/param/DeductionAmountEditParam.java b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountEditParam.java
new file mode 100644
index 000000000..f0e2a2412
--- /dev/null
+++ b/src/com/engine/salary/entity/deductionamount/param/DeductionAmountEditParam.java
@@ -0,0 +1,30 @@
+package com.engine.salary.entity.deductionamount.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 扣除名单查询参数
+ * <p>Copyright: Copyright (c) 2023</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeductionAmountEditParam {
+    /**
+     * ID
+     */
+    @DataCheck(require = true, message = "参数错误，id不能为空")
+    private Long id;
+
+    @DataCheck(require = true, message = "请选择是否扣除")
+    private Integer deductFlag;
+}
diff --git a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
index e203655e7..24bd438a2 100644
--- a/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
+++ b/src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
@@ -10,7 +10,7 @@ import java.util.Collection;
 import java.util.Date;
 
 /**
- * 人员报送记录
+ * 扣除名单
  */
 @Data
 @Builder
diff --git a/src/com/engine/salary/service/DeductionAmountService.java b/src/com/engine/salary/service/DeductionAmountService.java
index 3d7da8fad..5609882e9 100644
--- a/src/com/engine/salary/service/DeductionAmountService.java
+++ b/src/com/engine/salary/service/DeductionAmountService.java
@@ -18,6 +18,8 @@ public interface DeductionAmountService {
 
     void add(DeductionAmountAddParam param);
 
+    void edit(DeductionAmountEditParam param);
+
     void delete(DeductionAmountDeleteParam param);
 
     Object query(DeductionAmountOnlineQueryParam param);
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index 5b30ff10d..d36575ca8 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -129,6 +129,19 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                 .forEach(deductionAmountPO -> getDeductionAmountMapper().insertIgnoreNull(deductionAmountPO));
     }
 
+    @Override
+    public void edit(DeductionAmountEditParam param) {
+        ValidUtil.doValidator(param);
+
+        DeductionAmountPO po = getDeductionAmountMapper().getById(param.getId());
+        if (po == null) {
+            throw new SalaryRunTimeException("扣除名单不存在");
+        }
+
+        po.setDeductFlag(param.getDeductFlag());
+        getDeductionAmountMapper().updateIgnoreNull(po);
+    }
+
     @Override
     public void delete(DeductionAmountDeleteParam param) {
         if (CollUtil.isEmpty(param.getIds())) {
diff --git a/src/com/engine/salary/web/DeductionAmountController.java b/src/com/engine/salary/web/DeductionAmountController.java
index 3657d6f83..617c36920 100644
--- a/src/com/engine/salary/web/DeductionAmountController.java
+++ b/src/com/engine/salary/web/DeductionAmountController.java
@@ -51,6 +51,14 @@ public class DeductionAmountController {
         return new ResponseResult<DeductionAmountAddParam, Object>(user).run(getDeductionAmountWrapper(user)::add, param);
     }
 
+    @POST
+    @Path("/edit")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String edit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeductionAmountEditParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<DeductionAmountEditParam, Object>(user).run(getDeductionAmountWrapper(user)::edit, param);
+    }
+
     @POST
     @Path("/delete")
     @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
index a4f0628e9..a9586cafb 100644
--- a/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
+++ b/src/com/engine/salary/wrapper/DeductionAmountWrapper.java
@@ -32,6 +32,10 @@ public class DeductionAmountWrapper extends Service {
         getDeductionAmountService(user).add(param);
     }
 
+    public void edit(DeductionAmountEditParam param) {
+        getDeductionAmountService(user).edit(param);
+    }
+
     public void delete(DeductionAmountDeleteParam param) {
         getDeductionAmountService(user).delete(param);
     }
@@ -47,4 +51,5 @@ public class DeductionAmountWrapper extends Service {
     public String feedback(DeductionAmountFeedBackParam param) {
        return getDeductionAmountService(user).feedback(param);
     }
+
 }

From fe4b8b1fb3f7437d43c64e703590df777d6c54df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 17:18:09 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BA=BF=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctResultServiceImpl.java     | 22 +++++++++++++------
 .../sys/constant/SalarySysConstant.java       |  5 +++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 75c1f0fc5..7d6330b10 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -76,6 +76,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.stream.Collectors;
 
+import static com.engine.salary.sys.constant.SalarySysConstant.SALARY_ACCT_SYNC_TYPE;
+
 /**
  * 薪资核算结果
  * <p>Copyright: Copyright (c) 2022</p>
@@ -863,6 +865,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             // 12.4、是否采用系统算税
             TaxDeclarationFunctionEnum taxDeclarationFunction = getSalarySysConfService(user).getTaxDeclaration();
             // 12.5、多线程运算，运算结果存放在临时表中
+            //是否同步计算
+            boolean isSync = "1".equals(getSalarySysConfService(user).getValueByCode(SALARY_ACCT_SYNC_TYPE));
             for (List<SalaryAcctEmployeePO> acctEmployeePOS : partition) {
                 SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO()
                         .setSalaryAcctRecordPO(salaryAcctRecordPO)
@@ -884,13 +888,17 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                         .setVariableItems(variableItemPOS)
                         .setTaxDeclarationFunction(taxDeclarationFunction);
                 List<SalarySobBackItemPO> finalSalarySobBackItems = salarySobBackItems;
-                LocalRunnable localRunnable = new LocalRunnable() {
-                    @Override
-                    public void execute() {
-                        getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
-                    }
-                };
-                ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                if (isSync) {
+                    getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                } else {
+                    LocalRunnable localRunnable = new LocalRunnable() {
+                        @Override
+                        public void execute() {
+                            getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                        }
+                    };
+                    ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                }
             }
             // 13、等待所有子线程执行完毕
             childMonitor.await();
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index 9013c9126..ebca19807 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -71,6 +71,11 @@ public class SalarySysConstant {
      */
     public static final String SALARY_ACCT_EMPLOYEE_RULE = "salaryAcctEmployeeRule";
 
+    /**
+     * 是否采用线程池，同步异步。空/0异步， 1同步
+     */
+    public static final String SALARY_ACCT_SYNC_TYPE = "SALARY_ACCT_SYNC_TYPE";
+
     /**
      * 工资单二次验证方式
      */

From 8910183e7fa76114908abf5debe9ae663b2e3350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 18:08:19 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BA=BF=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SalaryAcctResultServiceImpl.java | 2 +-
 src/com/engine/salary/sys/constant/SalarySysConstant.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 7d6330b10..77a091911 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -866,7 +866,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             TaxDeclarationFunctionEnum taxDeclarationFunction = getSalarySysConfService(user).getTaxDeclaration();
             // 12.5、多线程运算，运算结果存放在临时表中
             //是否同步计算
-            boolean isSync = "1".equals(getSalarySysConfService(user).getValueByCode(SALARY_ACCT_SYNC_TYPE));
+            boolean isSync = "0".equals(getSalarySysConfService(user).getValueByCode(SALARY_ACCT_SYNC_TYPE));
             for (List<SalaryAcctEmployeePO> acctEmployeePOS : partition) {
                 SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO()
                         .setSalaryAcctRecordPO(salaryAcctRecordPO)
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index ebca19807..311476ea3 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -72,7 +72,7 @@ public class SalarySysConstant {
     public static final String SALARY_ACCT_EMPLOYEE_RULE = "salaryAcctEmployeeRule";
 
     /**
-     * 是否采用线程池，同步异步。空/0异步， 1同步
+     * 是否采用线程池，同步异步。空/1异步， 0同步
      */
     public static final String SALARY_ACCT_SYNC_TYPE = "SALARY_ACCT_SYNC_TYPE";
 

From b128f219f7bdec13e27fb27891f109c49a1f84bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 24 Mar 2025 14:57:00 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B3=84=E9=9C=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/extemp/dto/ExtEmpDTO.java   | 57 +++++++++++++++++++
 .../engine/salary/service/ExtEmpService.java  |  3 +-
 .../service/impl/ExtEmpServiceImpl.java       | 17 +++++-
 .../engine/salary/web/ExtEmpController.java   |  3 +-
 .../engine/salary/wrapper/ExtEmpWrapper.java  |  3 +-
 5 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java

diff --git a/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java
new file mode 100644
index 000000000..83f356300
--- /dev/null
+++ b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java
@@ -0,0 +1,57 @@
+package com.engine.salary.entity.extemp.dto;
+
+
+import com.engine.hrmelog.annotation.ElogTransform;
+import com.engine.salary.annotation.TableTitle;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 外部人员
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_external_employee
+@ElogTransform( name = "非系统人员")
+public class ExtEmpDTO {
+
+    @ElogTransform(name = "主键id")
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @TableTitle(title = "姓名", dataIndex = "username", key = "username")
+    private String username;
+
+    /**
+     * 部门
+     */
+    @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
+    private String departmentName;
+
+
+    /**
+     * 分部
+     */
+    @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName")
+    private String subcompanyName;
+
+    /**
+     * 入职日期
+     */
+    @TableTitle(title = "入职日期", dataIndex = "companystartdate", key = "companystartdate")
+    private String companystartdate;
+
+
+    /**
+     * 工号
+     */
+    @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode")
+    private String workcode;
+
+}
diff --git a/src/com/engine/salary/service/ExtEmpService.java b/src/com/engine/salary/service/ExtEmpService.java
index 7aaa9f11a..43ffacf58 100644
--- a/src/com/engine/salary/service/ExtEmpService.java
+++ b/src/com/engine/salary/service/ExtEmpService.java
@@ -1,6 +1,7 @@
 package com.engine.salary.service;
 
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
+import com.engine.salary.entity.extemp.dto.ExtEmpDTO;
 import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
 import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;
 import com.engine.salary.entity.extemp.param.ExtEmpSaveParam;
@@ -17,7 +18,7 @@ public interface ExtEmpService {
 
     List<ExtEmpPO> list(ExtEmpQueryParam param);
 
-     PageInfo<ExtEmpPO> listPage (ExtEmpQueryParam param);
+     PageInfo<ExtEmpDTO> listPage (ExtEmpQueryParam param);
 
     void save(ExtEmpSaveParam po);
 
diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
index 9d3bea91f..f2fbd1d89 100644
--- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
@@ -5,6 +5,7 @@ import com.engine.core.impl.Service;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
+import com.engine.salary.entity.extemp.dto.ExtEmpDTO;
 import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
 import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;
 import com.engine.salary.entity.extemp.param.ExtEmpSaveParam;
@@ -78,9 +79,21 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
     }
 
     @Override
-    public PageInfo<ExtEmpPO> listPage(ExtEmpQueryParam param) {
+    public PageInfo<ExtEmpDTO> listPage(ExtEmpQueryParam param) {
         List<ExtEmpPO> extEmpPOS = list(param);
-        return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), extEmpPOS, ExtEmpPO.class);
+
+        List<ExtEmpDTO> list = extEmpPOS.stream().map(po -> {
+            return ExtEmpDTO.builder()
+                    .id(po.getId())
+                    .username(po.getUsername())
+                    .departmentName(po.getDepartmentName())
+                    .subcompanyName(po.getSubcompanyName())
+                    .companystartdate(po.getCompanystartdate())
+                    .workcode(po.getWorkcode())
+                    .build();
+        }).collect(Collectors.toList());
+
+        return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, ExtEmpDTO.class);
 
     }
 
diff --git a/src/com/engine/salary/web/ExtEmpController.java b/src/com/engine/salary/web/ExtEmpController.java
index 4e6225435..3ee37f187 100644
--- a/src/com/engine/salary/web/ExtEmpController.java
+++ b/src/com/engine/salary/web/ExtEmpController.java
@@ -1,6 +1,7 @@
 package com.engine.salary.web;
 
 import com.engine.common.util.ServiceUtil;
+import com.engine.salary.entity.extemp.dto.ExtEmpDTO;
 import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
 import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;
 import com.engine.salary.entity.extemp.param.ExtEmpSaveParam;
@@ -48,7 +49,7 @@ public class ExtEmpController {
     @Produces(MediaType.APPLICATION_JSON)
     public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ExtEmpQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<ExtEmpQueryParam, PageInfo<ExtEmpPO>>(user).run(getExtEmpWrapper(user)::listPage, param);
+        return new ResponseResult<ExtEmpQueryParam, PageInfo<ExtEmpDTO>>(user).run(getExtEmpWrapper(user)::listPage, param);
     }
 
     @POST
diff --git a/src/com/engine/salary/wrapper/ExtEmpWrapper.java b/src/com/engine/salary/wrapper/ExtEmpWrapper.java
index fd936d61d..9a60b3e30 100644
--- a/src/com/engine/salary/wrapper/ExtEmpWrapper.java
+++ b/src/com/engine/salary/wrapper/ExtEmpWrapper.java
@@ -2,6 +2,7 @@ package com.engine.salary.wrapper;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.entity.extemp.dto.ExtEmpDTO;
 import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
 import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;
 import com.engine.salary.entity.extemp.param.ExtEmpSaveParam;
@@ -30,7 +31,7 @@ public class ExtEmpWrapper extends Service {
     }
 
 
-    public PageInfo<ExtEmpPO> listPage(ExtEmpQueryParam param) {
+    public PageInfo<ExtEmpDTO> listPage(ExtEmpQueryParam param) {
         return getExtEmpService(user).listPage(param);
     }
 

From 7fe109a1aff5248cb8ec96cee5e0782a8c75a376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 27 Mar 2025 17:12:37 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E4=B8=93=E9=A1=B9=E9=99=84=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/AddUpDeductionServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index ca998e4b7..28a142b39 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -1650,7 +1650,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
     }
 
     private void setExistedDataMap(AddUpDeductionOnlineRequestWrapper requestWrapper) {
-        List<Long> taxAgentIds = SalaryEntityUtil.properties(requestWrapper.getSalaryArchiveList(), SalaryArchivePO::getTaxAgentId, Collectors.toList());
+        Set<Long> taxAgentIds = SalaryEntityUtil.properties(requestWrapper.getSalaryArchiveList(), SalaryArchivePO::getTaxAgentId);
         List<AddUpDeduction> poList = getAddUpDeductionMapper().listSome(AddUpDeduction.builder().declareMonth(requestWrapper.getRequestPOList().get(0).getTaxYearMonth()).taxAgentIds(taxAgentIds).build());
         requestWrapper.setExistedDataMap(SalaryEntityUtil.convert2Map(poList, e -> e.getTaxAgentId() + "-" + e.getEmployeeId(), AddUpDeduction::getId));
     }

From 993cba21bdbe1a797761272afaa5fda50eadc6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 31 Mar 2025 17:15:01 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B3=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=96=E5=80=BC=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bo/TaxDeclarationCommon.java              | 128 +++++++++++++++---
 1 file changed, 108 insertions(+), 20 deletions(-)

diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationCommon.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationCommon.java
index e870f624e..19d0e742f 100644
--- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationCommon.java
+++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationCommon.java
@@ -1,5 +1,7 @@
 package com.engine.salary.entity.taxdeclaration.bo;
 
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import com.engine.salary.annotation.SalaryFormulaVar;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.AddUpSituation;
@@ -20,7 +22,6 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.IdGenerator;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -49,29 +50,116 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
 
         List<TaxDeclarationValuePO> taxDeclarationValues = Lists.newArrayListWithExpectedSize(employeeIdKeyMap.size());
         for (Map.Entry<Long, List<SalaryAcctEmployeePO>> employeeIdEntry : employeeIdKeyMap.entrySet()) {
-            // 取最后一次薪资核算记录的核算结果作为个税申报表的数据来源
-            SalaryAcctEmployeePO lastSalaryAcctEmployee = SalaryEntityUtil.findFirst(employeeIdEntry.getValue());
-            for (SalaryAcctEmployeePO salaryAcctEmployee : employeeIdEntry.getValue()) {
-                SalaryAcctRecordPO salaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(salaryAcctEmployee.getSalaryAcctRecordId());
-                SalaryAcctRecordPO lastSalaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(lastSalaryAcctEmployee.getSalaryAcctRecordId());
-                if (salaryAcctRecord.getCreateTime().compareTo(lastSalaryAcctRecord.getCreateTime()) > 0) {
-                    lastSalaryAcctEmployee = salaryAcctEmployee;
-                }
-            }
+
             Map<String, String> valueMap = Maps.newHashMap();
             for (TaxReportColumnPO taxReportColumn : taxDeclareContext.getTaxReportColumns()) {
-                SalarySobTaxReportRulePO salarySobTaxReportRule = taxDeclareContext.getSalarySobTaxReportRuleMap()
-                        .get(lastSalaryAcctEmployee.getSalarySobId() + "-" + taxReportColumn.getReportColumnDataIndex());
-                List<SalaryAcctResultPO> salaryAcctResultValue = salaryAcctResultValueMap.get(lastSalaryAcctEmployee.getId());
                 String value = "";
-                if (salarySobTaxReportRule != null && salaryAcctResultValue != null) {
-                    value = salaryAcctResultValue.stream()
-                            .filter(result -> result.getSalaryItemId().equals(salarySobTaxReportRule.getSalaryItemId()))
-                            .findFirst()
-                            .orElse(new SalaryAcctResultPO())
-                            .getResultValue();
+
+                List<String> firstValueList = Lists.newArrayList(
+                        "taxFreeIncome",
+                        "endowmentInsurance",
+                        "medicalInsurance",
+                        "unemploymentInsurance",
+                        "housingProvidentFund",
+                        "addUpChildEducation",
+                        "addUpHousingLoanInterest",
+                        "addUpHousingRent",
+                        "addUpSupportElderly",
+                        "addUpContinuingEducation",
+                        "addUpInfantCare",
+                        "annuity",
+                        "commercialHealthInsurance",
+                        "taxDeferredEndowmentInsurance",
+                        "other",
+                        "allowedDonation",
+                        "taxDeduction",
+                        "description",
+                        "addUpAdvanceTax");
+
+                List<String> lastValueList = Lists.newArrayList(
+                        "addUpIncome",
+                        "addUpTaxFreeIncome",
+                        "addUpSubtraction",
+                        "addUpSpecialDeduction",
+                        "addUpOtherDeduction",
+                        "addUpAllowedDonation",
+                        "addUpTaxableIncome",
+                        "taxRate",
+                        "quickDeductionFactor",
+                        "addUpTaxPayable",
+                        "addUpTaxDeduction"
+                );
+
+                List<String> mergeValueList = Lists.newArrayList(
+                        "income",
+                        "refundedOrSupplementedTax"
+                );
+
+                //取第一次值
+                if (firstValueList.contains(taxReportColumn.getReportColumnDataIndex())) {
+                    SalaryAcctEmployeePO lastSalaryAcctEmployee = SalaryEntityUtil.findFirst(employeeIdEntry.getValue());
+                    for (SalaryAcctEmployeePO salaryAcctEmployee : employeeIdEntry.getValue()) {
+                        SalaryAcctRecordPO salaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(salaryAcctEmployee.getSalaryAcctRecordId());
+                        SalaryAcctRecordPO lastSalaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(lastSalaryAcctEmployee.getSalaryAcctRecordId());
+                        if (salaryAcctRecord.getCreateTime().compareTo(lastSalaryAcctRecord.getCreateTime()) < 0) {
+                            lastSalaryAcctEmployee = salaryAcctEmployee;
+                        }
+                    }
+                    SalarySobTaxReportRulePO salarySobTaxReportRule = taxDeclareContext.getSalarySobTaxReportRuleMap()
+                            .get(lastSalaryAcctEmployee.getSalarySobId() + "-" + taxReportColumn.getReportColumnDataIndex());
+                    List<SalaryAcctResultPO> salaryAcctResultValue = salaryAcctResultValueMap.get(lastSalaryAcctEmployee.getId());
+                    if (salarySobTaxReportRule != null && salaryAcctResultValue != null) {
+                        value = salaryAcctResultValue.stream()
+                                .filter(result -> result.getSalaryItemId().equals(salarySobTaxReportRule.getSalaryItemId()))
+                                .findFirst()
+                                .orElse(new SalaryAcctResultPO())
+                                .getResultValue();
+                    }
+                    value = StrUtil.isNotBlank(value) ? value : Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue()) ? "0.00" : "";
+                }
+                //取多次累计值
+                else if (mergeValueList.contains(taxReportColumn.getReportColumnDataIndex()) && Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue())) {
+                    List<SalaryAcctEmployeePO> employeePOS = employeeIdEntry.getValue();
+                    BigDecimal income = new BigDecimal("0.00");
+                    for (SalaryAcctEmployeePO salaryAcctEmployeePO : employeePOS) {
+                        SalarySobTaxReportRulePO incomeRule = taxDeclareContext.getSalarySobTaxReportRuleMap()
+                                .get(salaryAcctEmployeePO.getSalarySobId() + "-" + taxReportColumn.getReportColumnDataIndex());
+                        List<SalaryAcctResultPO> salaryAcctResultValue = salaryAcctResultValueMap.get(salaryAcctEmployeePO.getId());
+                        if (incomeRule != null && salaryAcctResultValue != null) {
+                            String incomeValue = salaryAcctResultValue.stream()
+                                    .filter(result -> result.getSalaryItemId().equals(incomeRule.getSalaryItemId()))
+                                    .findFirst()
+                                    .orElse(new SalaryAcctResultPO())
+                                    .getResultValue();
+                            if (StrUtil.isNotBlank(incomeValue) && NumberUtil.isNumber(incomeValue)) {
+                                income = income.add(new BigDecimal(incomeValue));
+                            }
+                        }
+                    }
+                    value = income.toPlainString();
+                }
+                //取最后一次值
+                else {
+                    SalaryAcctEmployeePO lastSalaryAcctEmployee = SalaryEntityUtil.findFirst(employeeIdEntry.getValue());
+                    for (SalaryAcctEmployeePO salaryAcctEmployee : employeeIdEntry.getValue()) {
+                        SalaryAcctRecordPO salaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(salaryAcctEmployee.getSalaryAcctRecordId());
+                        SalaryAcctRecordPO lastSalaryAcctRecord = taxDeclareContext.getSalaryAcctRecordMap().get(lastSalaryAcctEmployee.getSalaryAcctRecordId());
+                        if (salaryAcctRecord.getCreateTime().compareTo(lastSalaryAcctRecord.getCreateTime()) > 0) {
+                            lastSalaryAcctEmployee = salaryAcctEmployee;
+                        }
+                    }
+                    SalarySobTaxReportRulePO salarySobTaxReportRule = taxDeclareContext.getSalarySobTaxReportRuleMap()
+                            .get(lastSalaryAcctEmployee.getSalarySobId() + "-" + taxReportColumn.getReportColumnDataIndex());
+                    List<SalaryAcctResultPO> salaryAcctResultValue = salaryAcctResultValueMap.get(lastSalaryAcctEmployee.getId());
+                    if (salarySobTaxReportRule != null && salaryAcctResultValue != null) {
+                        value = salaryAcctResultValue.stream()
+                                .filter(result -> result.getSalaryItemId().equals(salarySobTaxReportRule.getSalaryItemId()))
+                                .findFirst()
+                                .orElse(new SalaryAcctResultPO())
+                                .getResultValue();
+                    }
+                    value = StrUtil.isNotBlank(value) ? value : Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue()) ? "0.00" : "";
                 }
-                value = StringUtils.isNotBlank(value) ? value : Objects.equals(taxReportColumn.getDataType(), SalaryDataTypeEnum.NUMBER.getValue()) ? "0.00" : "";
                 valueMap.put(taxReportColumn.getReportColumnDataIndex(), value);
             }
             TaxDeclarationValuePO taxDeclarationValue = TaxDeclarationValuePO.builder()

From 1a4ab02bdce64490d1a7ea2a9ae351b388fab1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 31 Mar 2025 18:23:12 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deductionamount/dto/DeductionAmountDTO.java       |  4 +++-
 .../enums/employeedeclare/DeclareStatusEnum.java      | 11 +++++++++++
 .../service/impl/DeductionAmountServiceImpl.java      |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
index 43fc7de83..234ec01cd 100644
--- a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
+++ b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
@@ -83,8 +83,10 @@ public class DeductionAmountDTO {
     /**
      * 报送状态
      */
-    @TableTitle(title = "报送状态", dataIndex = "declareStatus", key = "declareStatus")
+    @TableTitle(title = "报送状态", dataIndex = "declareStatusName", key = "declareStatusName")
+    private String declareStatusName;
     private Integer declareStatus;
+
     private String declareErrorMsg;
 
 
diff --git a/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java b/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
index 2a91aafde..e0d759613 100644
--- a/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
+++ b/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
@@ -2,6 +2,8 @@ package com.engine.salary.enums.employeedeclare;
 
 import com.engine.salary.enums.BaseEnum;
 
+import java.util.Objects;
+
 /**
  * 人员报送状态
  * <p>Copyright: Copyright (c) 2023</p>
@@ -43,4 +45,13 @@ public enum DeclareStatusEnum implements BaseEnum<Integer> {
     public Integer getLabelId() {
         return labelId;
     }
+
+    public static DeclareStatusEnum getByValue(Integer value) {
+        for (DeclareStatusEnum e : DeclareStatusEnum.values()) {
+            if (Objects.equals(e.getValue(), value)) {
+                return e;
+            }
+        }
+        return NOT_DECLARE;
+    }
 }
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index d36575ca8..e6b3c6b4c 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -79,6 +79,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                         .cardNum(deductionAmountPO.getCardNum())
                         .cardType(deductionAmountPO.getCardType())
                         .declareStatus(deductionAmountPO.getDeclareStatus())
+                        .declareStatusName(DeclareStatusEnum.getByValue(deductionAmountPO.getDeclareStatus()).getDefaultLabel())
                         .declareErrorMsg(deductionAmountPO.getDeclareErrorMsg())
                         .deductFlag(deductionAmountPO.getDeductFlag())
                         .successfullyDeclared(deductionAmountPO.getSuccessfullyDeclared())
@@ -118,7 +119,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
                         .cardType(employeeDeclarePO.getCardType())
                         .nationality(employeeDeclarePO.getNationality())
                         .declareStatus(DeclareStatusEnum.NOT_DECLARE.getValue())
-                        .deductFlag(SalaryOnOffEnum.OFF.getValue())
+                        .deductFlag(SalaryOnOffEnum.ON.getValue())
                         .successfullyDeclared(SalaryOnOffEnum.OFF.getValue())
                         .creator((long) user.getUID())
                         .createTime(now)