From e97a35f158c77fb089a9d770cc54e4076714ea90 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 14 Dec 2023 15:57:55 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=A1=A5=E5=8F=91?=
 =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=91=E8=A1=A5=E5=8F=91=E9=A1=B9=E7=9B=AEfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
index 893b0d55e..cd7af96ba 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
@@ -167,6 +167,8 @@ public class SalaryTemplateBO {
                                         .id(String.valueOf(e.getSalaryItemId()))
                                         .salaryItemId(String.valueOf(e.getSalaryItemId()))
                                         .name(e.getName())
+                                        .salaryItemShowName(e.getName())
+                                        .originName(e.getName())
                                         .sortedIndex(e.getSortedIndex())
                                         .build()
                         );

From 4f8606b00ee4311c09848fa62f183b56f6fa9940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sat, 16 Dec 2023 12:35:24 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/wrapper/SalaryStatisticsReportWrapper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index ce270b1fa..86b7aeb7d 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -216,6 +216,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
     /**
      * 复制薪资账套
+     *
      * @param id
      */
     public void duplicate(Long id) {
@@ -322,7 +323,7 @@ public class SalaryStatisticsReportWrapper extends Service {
             //报表中缓存的条件
             salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
             if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5);
+                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
             }
         }
 
@@ -346,7 +347,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_IDS, salaryReportIds + "," + id);
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id, salaryReportConditions + "," + paramMd5);
-        getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5, resultMap);
+        getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5, resultMap);
 
 
         return resultMap;

From bda3d7080bee22cb7fab3b869b54840066c4e6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sat, 16 Dec 2023 12:36:56 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/service/impl/SalaryStatisticsReportServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index 4bb650f92..3f9745f11 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -497,7 +497,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
                         Arrays.asList(salaryReportConditions.split(",")).forEach(paramMd5 -> {
                                     if (StringUtils.isNotBlank(paramMd5)) {
                                         //条件对应的结果
-                                        getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5);
+                                        getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
                                     }
                                 }
                         );

From e8223a832bb0c89038a2f3b56811fd88a365abdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sat, 16 Dec 2023 12:40:33 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/wrapper/SalaryStatisticsReportWrapper.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 86b7aeb7d..508877028 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -345,6 +345,7 @@ public class SalaryStatisticsReportWrapper extends Service {
         resultMap.put("reportId", id);
 
 
+        //设置报表缓存
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_IDS, salaryReportIds + "," + id);
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id, salaryReportConditions + "," + paramMd5);
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5, resultMap);

From e67cb5bf83df94cfc5238d478e1ba62e42dfa382 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Mon, 25 Dec 2023 16:31:36 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?=
 =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BAlike=E5=88=86=E6=88=903=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/taxagent/TaxAgentMapper.xml | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml b/src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
index 84e424805..b39f69b49 100644
--- a/src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
+++ b/src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
@@ -38,6 +38,31 @@
         </if>
     </sql>
 
+
+    <sql id="paramSql" databaseId="oracle">
+        <if test="param.ids != null and param.ids.size()>0">
+            AND id IN
+            <foreach collection="param.ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.name != null and param.name != ''">
+            AND name like '%'||#{param.name}||'%'
+        </if>
+    </sql>
+
+    <sql id="paramSql" databaseId="sqlserver">
+        <if test="param.ids != null and param.ids.size()>0">
+            AND id IN
+            <foreach collection="param.ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.name != null and param.name != ''">
+            AND name like '%'+#{param.name}+'%'
+        </if>
+    </sql>
+
     <!-- 查询 -->
     <select id="listBySome" resultMap="BaseResultMap">
         SELECT

From e976c7aaec276a3df94b98327e3e62d62fda5095 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 27 Dec 2023 09:32:31 +0800
Subject: [PATCH 06/10] =?UTF-8?q?oracle=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/salarybill/SalaryTemplateMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
index a88ac1600..17e371c33 100644
--- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
@@ -956,7 +956,7 @@
                 #{tenantKey},
             </if>
             <if test="smsSetting != null">
-                #{sms_setting},
+                #{smsSetting},
             </if>
         </trim>
     </insert>

From 0f4d92f302ada3258313c769b734aa5f310b7741 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 28 Dec 2023 10:10:08 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8A=A5=E9=80=81=E8=BA=AB=E4=BB=BD=E4=B8=AD=E5=8F=B7=E8=BD=AC?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/EmployeeDeclareExcelServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
index 4352be9cf..4bfb84b78 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
@@ -267,7 +267,8 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
                             errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(0, "证件号码格式不正确"));
                             errorData.add(errorMessageMap);
                         } else {
-                            employeeDeclareExcel.setCardNum(dataValue);
+                            // 身份证号全部转为大写
+                            employeeDeclareExcel.setCardNum(dataValue.toUpperCase());
                             employeeDeclareExcel.setGender(SalaryCardUtil.judgeGender(dataValue).getValue().toString());
                             employeeDeclareExcel.setBirthday(SalaryCardUtil.judgeBirthday(dataValue).toString());
                         }

From 2befcfd1f2585e6103152ac5c5495c845656b11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 28 Dec 2023 11:08:53 +0800
Subject: [PATCH 08/10] =?UTF-8?q?pg=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/PG/sql202206090403.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resource/sqlupgrade/PG/sql202206090403.sql b/resource/sqlupgrade/PG/sql202206090403.sql
index 679a8cc59..8f5d32f79 100644
--- a/resource/sqlupgrade/PG/sql202206090403.sql
+++ b/resource/sqlupgrade/PG/sql202206090403.sql
@@ -1,3 +1,3 @@
-ALTER TABLE hrsa_tax_declaration  ADD COLUMN income_category int NOT NULL ;
+ALTER TABLE hrsa_tax_declaration  ADD COLUMN income_category int  ;
 
-ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int NOT NULL ;
\ No newline at end of file
+ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int  ;
\ No newline at end of file

From 06fe3144ba995ac3b3d98792c0a27f28af2dae66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 28 Dec 2023 15:37:01 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/util/excel/DataTypeEnum.java       | 32 +++++++++++++++++++
 .../engine/salary/util/excel/ExcelHead.java   | 28 ++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src/com/engine/salary/util/excel/DataTypeEnum.java
 create mode 100644 src/com/engine/salary/util/excel/ExcelHead.java

diff --git a/src/com/engine/salary/util/excel/DataTypeEnum.java b/src/com/engine/salary/util/excel/DataTypeEnum.java
new file mode 100644
index 000000000..15e845cd9
--- /dev/null
+++ b/src/com/engine/salary/util/excel/DataTypeEnum.java
@@ -0,0 +1,32 @@
+package com.engine.salary.util.excel;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public enum DataTypeEnum {
+    string("string", "字符类型"),
+    number("string", "数字类型"),
+    date("string", "日期类型");
+
+    private String value;
+    private String name;
+
+    DataTypeEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+    public static DataTypeEnum parseByValue(String value) {
+        return Arrays.stream(DataTypeEnum.values()).filter(typeEnum -> Objects.equals(typeEnum.getValue(), value)).findFirst().orElse(null);
+    }
+
+}
diff --git a/src/com/engine/salary/util/excel/ExcelHead.java b/src/com/engine/salary/util/excel/ExcelHead.java
new file mode 100644
index 000000000..cec7da51d
--- /dev/null
+++ b/src/com/engine/salary/util/excel/ExcelHead.java
@@ -0,0 +1,28 @@
+package com.engine.salary.util.excel;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据列表表头
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelHead {
+
+    String title() default "";
+
+    String dataIndex() default "";
+
+    DataTypeEnum dataType() default DataTypeEnum.string;
+
+    int labelId() default -1;
+
+    String width() default "";
+
+}

From 7e22711dcd684350c7006efbbc4ecbfa545ab9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 28 Dec 2023 15:47:05 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/TaxDeclarationAnnualListDTO.java      | 11 +++++
 .../dto/TaxDeclarationLaborListDTO.java       | 40 +++++++++++++------
 .../dto/TaxDeclarationWageListDTO.java        | 26 ++++++++++++
 .../impl/TaxDeclarationExcelServiceImpl.java  | 28 ++-----------
 .../engine/salary/util/excel/ExcelUtil.java   | 22 ++++++++++
 5 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java
index 75b1b3191..696a3f9f7 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java
@@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto;
 
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.annotation.TableTitle;
+import com.engine.salary.util.excel.ExcelHead;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -31,59 +32,69 @@ public class TaxDeclarationAnnualListDTO {
             text = "工号", width = "10%", column = "jobNum"
     )
     @TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum")
+    @ExcelHead(title ="工号",dataIndex = "jobNum")
     private String jobNum;
 
     @SalaryTableColumn(
             text = "姓名", width = "10%", column = "username"
     )
     @TableTitle(title ="姓名",dataIndex = "username",key = "username")
+    @ExcelHead(title ="姓名",dataIndex = "username")
     private String username;
 
     @SalaryTableColumn(
             text = "证件类型", width = "10%", column = "cardType"
     )
     @TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType")
+    @ExcelHead(title ="证件类型",dataIndex = "cardType")
     private String cardType;
 
     @SalaryTableColumn(
             text = "证件号码", width = "10%", column = "cardNum"
     )
     @TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum")
+    @ExcelHead(title ="证件号码",dataIndex = "cardNum")
     private String cardNum;
 
     @SalaryTableColumn(
             text = "全年一次性奖金额", width = "10%", column = "annualIncome"
     )
     @TableTitle(title ="全年一次性奖金额",dataIndex = "annualIncome",key = "annualIncome")
+    @ExcelHead(title ="全年一次性奖金额",dataIndex = "annualIncome")
     private String annualIncome;
 
     @SalaryTableColumn(
             text = "免税收入", width = "10%", column = "annualTaxFreeIncome"
     )
     @TableTitle(title ="免税收入",dataIndex = "annualTaxFreeIncome",key = "annualTaxFreeIncome")
+    @ExcelHead(title ="免税收入",dataIndex = "annualTaxFreeIncome")
     private String annualTaxFreeIncome;
 
     @SalaryTableColumn(
             text = "其他", width = "10%", column = "annualOther"
     )
     @TableTitle(title ="其他",dataIndex = "annualOther",key = "annualOther")
+    @ExcelHead(title ="其他",dataIndex = "annualOther")
     private String annualOther;
 
     @SalaryTableColumn(
             text = "准予扣除的捐赠额", width = "10%", column = "annualDonateTax"
     )
     @TableTitle(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax",key = "annualDonateTax")
+    @ExcelHead(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax")
     private String annualDonateTax;
 
     @SalaryTableColumn(
             text = "减免税额", width = "10%", column = "annualTaxSavings"
     )
     @TableTitle(title ="减免税额",dataIndex = "annualTaxSavings",key = "annualTaxSavings")
+    @ExcelHead(title ="减免税额",dataIndex = "annualTaxSavings")
     private String annualTaxSavings;
 
     @SalaryTableColumn(
             text = "备注", width = "10%", column = "annualRemark"
     )
     @TableTitle(title ="备注",dataIndex = "annualRemark",key = "annualRemark")
+    @ExcelHead(title ="备注",dataIndex = "annualRemark")
     private String annualRemark;
 }
diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java
index 73872aa0a..ce03fd52c 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java
@@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto;
 
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.annotation.TableTitle;
+import com.engine.salary.util.excel.ExcelHead;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -30,78 +31,91 @@ public class TaxDeclarationLaborListDTO {
     @SalaryTableColumn(
             text = "工号", width = "10%", column = "jobNum"
     )
-    @TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum")
+    @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
+    @ExcelHead(title = "工号", dataIndex = "jobNum")
     private String jobNum;
 
     @SalaryTableColumn(
             text = "姓名", width = "10%", column = "username"
     )
-    @TableTitle(title ="姓名",dataIndex = "username",key = "username")
+    @TableTitle(title = "姓名", dataIndex = "username", key = "username")
+    @ExcelHead(title = "姓名", dataIndex = "username")
     private String username;
 
     @SalaryTableColumn(
             text = "证件类型", width = "10%", column = "cardType"
     )
-    @TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType")
+    @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
+    @ExcelHead(title = "证件类型", dataIndex = "cardType")
     private String cardType;
 
     @SalaryTableColumn(
             text = "证件号码", width = "10%", column = "cardNum"
     )
-    @TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum")
+    @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
+    @ExcelHead(title = "证件号码", dataIndex = "cardNum")
     private String cardNum;
 
     @SalaryTableColumn(
             text = "所得项目", width = "10%", column = "incomeItems"
     )
-    @TableTitle(title ="所得项目",dataIndex = "incomeItems",key = "incomeItems")
+    @TableTitle(title = "所得项目", dataIndex = "incomeItems", key = "incomeItems")
+    @ExcelHead(title = "所得项目", dataIndex = "incomeItems")
     private String incomeItems;
 
     @SalaryTableColumn(
             text = "劳务收入", width = "10%", column = "laborIncome"
     )
-    @TableTitle(title ="劳务收入",dataIndex = "laborIncome",key = "laborIncome")
+    @TableTitle(title = "劳务收入", dataIndex = "laborIncome", key = "laborIncome")
+    @ExcelHead(title = "劳务收入", dataIndex = "laborIncome")
     private String laborIncome;
 
     @SalaryTableColumn(
             text = "劳务免税收入", width = "10%", column = "laborTaxFreeIncome"
     )
-    @TableTitle(title ="劳务免税收入",dataIndex = "laborTaxFreeIncome",key = "laborTaxFreeIncome")
+    @TableTitle(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome", key = "laborTaxFreeIncome")
+    @ExcelHead(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome")
     private String laborTaxFreeIncome;
 
     @SalaryTableColumn(
             text = "商业健康保险", width = "10%", column = "commercialHealthInsurance"
     )
-    @TableTitle(title ="商业健康保险",dataIndex = "commercialHealthInsurance",key = "commercialHealthInsurance")
+    @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance")
+    @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")
     private String commercialHealthInsurance;
 
     @SalaryTableColumn(
             text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance"
     )
-    @TableTitle(title ="税延养老保险",dataIndex = "taxDeferredEndowmentInsurance",key = "taxDeferredEndowmentInsurance")
+    @TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance")
+    @ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance")
     private String taxDeferredEndowmentInsurance;
 
     @SalaryTableColumn(
             text = "其他", width = "10%", column = "other"
     )
-    @TableTitle(title ="其他",dataIndex = "other",key = "other")
+    @TableTitle(title = "其他", dataIndex = "other", key = "other")
+    @ExcelHead(title = "其他", dataIndex = "other")
     private String other;
 
     @SalaryTableColumn(
             text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation"
     )
-    @TableTitle(title ="准予扣除的捐赠额",dataIndex = "allowedDonation",key = "allowedDonation")
+    @TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation")
+    @ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation")
     private String allowedDonation;
 
     @SalaryTableColumn(
             text = "减免税额", width = "10%", column = "taxDeduction"
     )
-    @TableTitle(title ="减免税额",dataIndex = "taxDeduction",key = "taxDeduction")
+    @TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction")
+    @ExcelHead(title = "减免税额", dataIndex = "taxDeduction")
     private String taxDeduction;
 
     @SalaryTableColumn(
             text = "备注", width = "10%", column = "description"
     )
-    @TableTitle(title ="备注",dataIndex = "description",key = "description")
+    @TableTitle(title = "备注", dataIndex = "description", key = "description")
+    @ExcelHead(title = "备注", dataIndex = "description")
     private String description;
 }
diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
index 3725aaf27..419f8f1e0 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
@@ -4,6 +4,7 @@ import com.cloudstore.eccom.pc.table.WeaTableType;
 import com.engine.salary.annotation.SalaryTable;
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.annotation.TableTitle;
+import com.engine.salary.util.excel.ExcelHead;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,101 +36,126 @@ public class TaxDeclarationWageListDTO {
 
     @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
     @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
+    @ExcelHead(title = "工号", dataIndex = "jobNum")
     private String jobNum;
 
     @SalaryTableColumn(text = "姓名", width = "10%", column = "username")
     @TableTitle(title = "姓名", dataIndex = "username", key = "username")
+    @ExcelHead(title = "姓名", dataIndex = "username")
     private String username;
 
     @SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType")
     @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType")
+    @ExcelHead(title = "证件类型", dataIndex = "cardType")
     private String cardType;
 
     @SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum")
     @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum")
+    @ExcelHead(title = "证件号码", dataIndex = "cardNum")
     private String cardNum;
 
     @SalaryTableColumn(text = "本期收入", width = "10%", column = "income")
     @TableTitle(title = "本期收入", dataIndex = "income", key = "income")
+    @ExcelHead(title = "本期收入", dataIndex = "income")
     private String income;
 
     @SalaryTableColumn(text = "本期免税收入", width = "10%", column = "taxFreeIncome")
     @TableTitle(title = "本期免税收入", dataIndex = "taxFreeIncome", key = "taxFreeIncome")
+    @ExcelHead(title = "本期免税收入", dataIndex = "taxFreeIncome")
     private String taxFreeIncome;
 
     @SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "endowmentInsurance")
     @TableTitle(title = "基本养老保险费", dataIndex = "endowmentInsurance", key = "endowmentInsurance")
+    @ExcelHead(title = "基本养老保险费", dataIndex = "endowmentInsurance")
     private String endowmentInsurance;
 
     @SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "medicalInsurance")
     @TableTitle(title = "基本医疗保险费", dataIndex = "medicalInsurance", key = "medicalInsurance")
+    @ExcelHead(title = "基本医疗保险费", dataIndex = "medicalInsurance")
     private String medicalInsurance;
 
     @SalaryTableColumn(text = "失业保险费", width = "10%", column = "unemploymentInsurance")
     @TableTitle(title = "失业保险费", dataIndex = "unemploymentInsurance", key = "unemploymentInsurance")
+    @ExcelHead(title = "失业保险费", dataIndex = "unemploymentInsurance")
     private String unemploymentInsurance;
 
     @SalaryTableColumn(text = "住房公积金", width = "10%", column = "housingProvidentFund")
     @TableTitle(title = "住房公积金", dataIndex = "housingProvidentFund", key = "housingProvidentFund")
+    @ExcelHead(title = "住房公积金", dataIndex = "housingProvidentFund")
     private String housingProvidentFund;
 
     @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation")
     @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation")
+    @ExcelHead(title = "累计子女教育", dataIndex = "addUpChildEducation")
     private String addUpChildEducation;
 
     @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest")
     @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest")
+    @ExcelHead(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest")
     private String addUpHousingLoanInterest;
 
     @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent")
     @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent")
+    @ExcelHead(title = "累计住房租金", dataIndex = "addUpHousingRent")
     private String addUpHousingRent;
 
     @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation")
     @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation")
+    @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation")
     private String addUpContinuingEducation;
 
     @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly")
     @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly")
+    @ExcelHead(title = "累计赡养老人", dataIndex = "addUpSupportElderly")
     private String addUpSupportElderly;
 
     @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical")
     @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical")
+    @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical")
     private String addUpIllnessMedical;
 
     @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare")
     @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare")
+    @ExcelHead(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare")
     private String addUpInfantCare;
 
     @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension")
     @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension")
+    @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension")
     private String addUpPrivatePension;
 
     @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity")
     @TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity")
+    @ExcelHead(title = "企业（职业）年金", dataIndex = "annuity")
     private String annuity;
 
     @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance")
     @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance")
+    @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")
     private String commercialHealthInsurance;
 
     @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance")
     @TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance")
+    @ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance")
     private String taxDeferredEndowmentInsurance;
 
     @SalaryTableColumn(text = "其他", width = "10%", column = "other")
     @TableTitle(title = "其他", dataIndex = "other", key = "other")
+    @ExcelHead(title = "其他", dataIndex = "other")
     private String other;
 
     @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation")
     @TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation")
+    @ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation")
     private String allowedDonation;
 
     @SalaryTableColumn(text = "减免税额", width = "10%", column = "taxDeduction")
     @TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction")
+    @ExcelHead(title = "减免税额", dataIndex = "taxDeduction")
     private String taxDeduction;
 
     @SalaryTableColumn(text = "备注", width = "10%", column = "description")
     @TableTitle(title = "备注", dataIndex = "description", key = "description")
+    @ExcelHead(title = "备注", dataIndex = "description")
     private String description;
 }
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
index 957957790..c9eb8796a 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
@@ -2,7 +2,6 @@ package com.engine.salary.service.impl;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
-import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationAnnualListDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO;
@@ -23,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.hrm.User;
 
-import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -68,7 +66,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
         List<String> dataIndexList = Lists.newArrayList();
         if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.WAGES_AND_SALARIES.getValue())) {
             // 解析表头
-            parseHeader(TaxDeclarationWageListDTO.class, headerList, dataIndexList);
+            ExcelUtil.parseHeader(TaxDeclarationWageListDTO.class, headerList, dataIndexList);
             rows.add(headerList);
             for (int i = 0; i < totalPages; i++) {
                 TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam();
@@ -89,7 +87,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
         }
         if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.REMUNERATION_FOR_LABOR.getValue())) {
             // 解析表头
-            parseHeader(TaxDeclarationLaborListDTO.class, headerList, dataIndexList);
+            ExcelUtil.parseHeader(TaxDeclarationLaborListDTO.class, headerList, dataIndexList);
             rows.add(headerList);
             for (int i = 0; i < totalPages; i++) {
                 TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam();
@@ -111,7 +109,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
 
         if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.ONETIME_ANNUAL_BONUS.getValue())) {
             // 解析表头
-            parseHeader(TaxDeclarationAnnualListDTO.class, headerList, dataIndexList);
+            ExcelUtil.parseHeader(TaxDeclarationAnnualListDTO.class, headerList, dataIndexList);
             rows.add(headerList);
             for (int i = 0; i < totalPages; i++) {
                 TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam();
@@ -133,24 +131,4 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
         return ExcelUtil.genWorkbookV2(rows, sheetName);
     }
 
-
-    /**
-     * 解析表头
-     *
-     * @param clazz
-     * @param headerList
-     * @param dataIndexList
-     * @param <T>
-     */
-    private <T> void parseHeader(Class<T> clazz, List<Object> headerList, List<String> dataIndexList) {
-        Field[] declaredFields = clazz.getDeclaredFields();
-        for (Field declaredField : declaredFields) {
-            if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) {
-                continue;
-            }
-            SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class);
-            headerList.add(SalaryI18nUtil.getI18nLabel( annotation.labelId(), annotation.text()));
-            dataIndexList.add(declaredField.getName());
-        }
-    }
 }
diff --git a/src/com/engine/salary/util/excel/ExcelUtil.java b/src/com/engine/salary/util/excel/ExcelUtil.java
index c50c11d2b..877714295 100644
--- a/src/com/engine/salary/util/excel/ExcelUtil.java
+++ b/src/com/engine/salary/util/excel/ExcelUtil.java
@@ -1,6 +1,7 @@
 package com.engine.salary.util.excel;
 
 import com.engine.salary.util.SalaryDateUtil;
+import com.engine.salary.util.SalaryI18nUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.FillPatternType;
@@ -9,6 +10,7 @@ import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.xssf.usermodel.*;
 
 import java.awt.*;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 
@@ -267,4 +269,24 @@ public class ExcelUtil {
         }
         return workbook;
     }
+
+    /**
+     * 解析表头
+     *
+     * @param clazz
+     * @param headerList
+     * @param dataIndexList
+     * @param <T>
+     */
+    public static <T> void parseHeader(Class<T> clazz, List<Object> headerList, List<String> dataIndexList) {
+        Field[] declaredFields = clazz.getDeclaredFields();
+        for (Field declaredField : declaredFields) {
+            if (!declaredField.isAnnotationPresent(ExcelHead.class)) {
+                continue;
+            }
+            ExcelHead annotation = declaredField.getAnnotation(ExcelHead.class);
+            headerList.add(SalaryI18nUtil.getI18nLabel(annotation.labelId(), annotation.title()));
+            dataIndexList.add(declaredField.getName());
+        }
+    }
 }