From 5946ea6985823d8383fd45df0b26ef9c88500d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 27 Dec 2024 15:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B6=E4=BB=96=E5=85=8D?=
 =?UTF-8?q?=E7=A8=8E=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/datacollection/dto/EndowmentInsuranceListDTO.java    | 1 +
 .../salary/mapper/datacollection/OtherDeductionMapper.xml       | 2 +-
 .../engine/salary/service/impl/OtherDeductionServiceImpl.java   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java b/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java
index 0ca693bcf..4b48e20bc 100644
--- a/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/EndowmentInsuranceListDTO.java
@@ -83,6 +83,7 @@ public class EndowmentInsuranceListDTO {
 
     @ExcelProperty(index = 6)
     @TableTitle(title = "申报扣除月份", dataIndex = "deductionMonth", key = "deductionMonth")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private Date deductionMonth;
 
     @ExcelProperty(index = 7)
diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
index f17af4a9c..ecebc3815 100644
--- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
@@ -503,7 +503,7 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="free_income =case" suffix="end,">
+            <trim prefix="derate_deduction =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.derateDeduction!=null">
                         when id=#{item.id} then #{item.derateDeduction}
diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
index 251523ba8..30b393f4a 100644
--- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
@@ -2520,6 +2520,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
                     .taxYearMonth(deductionPO.getDeclareMonth())
                     .employeeId(deductionPO.getEmployeeId())
                     .taxAgentId(deductionPO.getTaxAgentId())
+                    .deductionMonth(param.getDeductionMonth())
                     .accountNumber(param.getAccountNumber())
                     .checkCode(param.getCheckCode())
                     .yearPremium(param.getYearPremium())
@@ -2541,6 +2542,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
             }
 
             po.setUpdateTime(now);
+            po.setDeductionMonth(param.getDeductionMonth());
             po.setAccountNumber(param.getAccountNumber());
             po.setCheckCode(param.getCheckCode());
             po.setYearPremium(param.getYearPremium());