diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalaryMaster.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalaryMaster.java index 1c99fb6..f28df48 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalaryMaster.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSalaryMaster.java @@ -55,6 +55,8 @@ public class OaSalaryMaster extends BaseEntity { * 经办人姓名 */ private String operator; + //新增薪资模板属性 + private String salaryTemplate; /** * 备注 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryMasterBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryMasterBo.java index 47403fb..430e249 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryMasterBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSalaryMasterBo.java @@ -72,5 +72,7 @@ public class OaSalaryMasterBo extends BaseEntity { */ private List salaryDetailList; + //新增薪资模板属性 + private String salaryTemplate; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/BatchInsertSalaryStringDto.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/BatchInsertSalaryStringDto.java index 81b2d98..70f297b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/BatchInsertSalaryStringDto.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/BatchInsertSalaryStringDto.java @@ -51,6 +51,8 @@ public class BatchInsertSalaryStringDto { * 经办人姓名 */ private String operator; + //新增薪资模板属性 + private String salaryTemplate; /** * 备注 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryMasterVo.java index ebd8707..30399d2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryMasterVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSalaryMasterVo.java @@ -74,6 +74,8 @@ public class OaSalaryMasterVo { */ @ExcelProperty(value = "备注") private String remark; + //新增薪资模板属性 + private String salaryTemplate; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/utils/SalaryStringConverter.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/utils/SalaryStringConverter.java index 7a78c03..6ce2613 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/utils/SalaryStringConverter.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/utils/SalaryStringConverter.java @@ -36,6 +36,7 @@ public class SalaryStringConverter { masterBo.setCashier(requestDto.getCashier()); masterBo.setDeptManager(requestDto.getDeptManager()); masterBo.setOperator(requestDto.getOperator()); + masterBo.setSalaryTemplate(requestDto.getSalaryTemplate()); masterBo.setRemark(requestDto.getRemark()); // 转换明细列表 diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml index 62e16ea..cd6936c 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml @@ -13,6 +13,7 @@ +