修复其他免税编辑功能

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)

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}

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());