From bca7697d754298fe214dc24c4a73360ecedeebea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 29 Dec 2023 11:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=A8=E5=B9=B4=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=80=A7=E5=A5=96=E9=87=91=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/EmployeeDeclareListDTO.java | 16 ++++++++++++++++ .../impl/SalaryAcctRecordServiceImpl.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/employeedeclare/dto/EmployeeDeclareListDTO.java b/src/com/engine/salary/entity/employeedeclare/dto/EmployeeDeclareListDTO.java index 93a06d3b5..76af21666 100644 --- a/src/com/engine/salary/entity/employeedeclare/dto/EmployeeDeclareListDTO.java +++ b/src/com/engine/salary/entity/employeedeclare/dto/EmployeeDeclareListDTO.java @@ -5,6 +5,7 @@ import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; import com.engine.salary.enums.employeedeclare.DeclareStatusEnum; import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; +import com.engine.salary.util.excel.ExcelHead; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -42,72 +43,86 @@ public class EmployeeDeclareListDTO { // 姓名 @SalaryTableColumn(text = "姓名", width = "10%", column = "employeeName") @TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName") + @ExcelHead(title = "姓名", dataIndex = "employeeName") private String employeeName; // 分部 @SalaryTableColumn(text = "分部", width = "10%", column = "subCompanyName") @TableTitle(title = "分部", dataIndex = "subCompanyName", key = "subCompanyName") + @ExcelHead(title = "分部", dataIndex = "subCompanyName") private String subCompanyName; // 部门 @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") + @ExcelHead(title = "部门", dataIndex = "departmentName") private String departmentName; // 个税扣缴义务人 @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") + @ExcelHead(title = "个税扣缴义务人", dataIndex = "taxAgentName") private String taxAgentName; // 工号 @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") + @ExcelHead(title = "工号", dataIndex = "jobNum") private String jobNum; // 证件类型 @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 = "gender") @TableTitle(title = "性别", dataIndex = "gender", key = "gender") + @ExcelHead(title = "性别", dataIndex = "gender") private String gender; // 出生日期 @SalaryTableColumn(text = "出生日期", width = "10%", column = "birthday") @TableTitle(title = "出生日期", dataIndex = "birthday", key = "birthday") + @ExcelHead(title = "出生日期", dataIndex = "birthday") private String birthday; // 人员状态 @SalaryTableColumn(text = "人员状态", width = "10%", column = "employmentStatus") @TableTitle(title = "人员状态", dataIndex = "employmentStatus", key = "employmentStatus") + @ExcelHead(title = "人员状态", dataIndex = "employmentStatus") private String employmentStatus; // 手机号码 @SalaryTableColumn(text = "手机号码", width = "10%", column = "mobile") @TableTitle(title = "手机号码", dataIndex = "mobile", key = "mobile") + @ExcelHead(title = "手机号码", dataIndex = "mobile") private String mobile; // 任职受雇从业类型 @SalaryTableColumn(text = "任职受雇从业类型", width = "10%", column = "employmentType") @TableTitle(title = "任职受雇从业类型", dataIndex = "employmentType", key = "employmentType") + @ExcelHead(title = "任职受雇从业类型", dataIndex = "employmentType") private String employmentType; // 任职受雇从业日期 @SalaryTableColumn(text = "任职受雇从业日期", width = "10%", column = "employmentDate") @TableTitle(title = "任职受雇从业日期", dataIndex = "employmentDate", key = "employmentDate") + @ExcelHead(title = "任职受雇从业日期", dataIndex = "employmentDate") private String employmentDate; // 离职日期 @SalaryTableColumn(text = "离职日期", width = "10%", column = "dismissDate") @TableTitle(title = "离职日期", dataIndex = "dismissDate", key = "dismissDate") + @ExcelHead(title = "离职日期", dataIndex = "dismissDate") private String dismissDate; // 申报状态 @@ -116,6 +131,7 @@ public class EmployeeDeclareListDTO { // 申报状态 @SalaryTableColumn(text = "申报状态", width = "10%", column = "declareStatusDesc") @TableTitle(title = "申报状态", dataIndex = "declareStatusDesc", key = "declareStatusDesc") + @ExcelHead(title = "申报状态", dataIndex = "declareStatusDesc") private String declareStatusDesc; // 申报失败原因 diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 79376b60d..c68b1dc9e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -514,7 +514,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe .findAny() .orElse(null); if (diffTaxCycleSalaryAcctTaxAgent != null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160502, "全年一次性奖金收入一年内只能申报一次，所以税款所属期必须相同")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160502, "全年一次性奖金收入一年内只能申报一次，所以税款所属期必须相同")); } } }