feat(oa): 新增薪资模板属性
- 在 BatchInsertSalaryStringDto、OaSalaryMaster、OaSalaryMasterBo、OaSalaryMasterVo 中添加 salaryTemplate 字段 - 更新 OaSalaryMasterMapper.xml,添加 salaryTemplate 字段的映射 - 在 SalaryStringConverter 中处理新增的 salaryTemplate 字段
This commit is contained in:
@@ -55,6 +55,8 @@ public class OaSalaryMaster extends BaseEntity {
|
|||||||
* 经办人姓名
|
* 经办人姓名
|
||||||
*/
|
*/
|
||||||
private String operator;
|
private String operator;
|
||||||
|
//新增薪资模板属性
|
||||||
|
private String salaryTemplate;
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -72,5 +72,7 @@ public class OaSalaryMasterBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private List<OaSalaryDetailBo> salaryDetailList;
|
private List<OaSalaryDetailBo> salaryDetailList;
|
||||||
|
|
||||||
|
//新增薪资模板属性
|
||||||
|
private String salaryTemplate;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ public class BatchInsertSalaryStringDto {
|
|||||||
* 经办人姓名
|
* 经办人姓名
|
||||||
*/
|
*/
|
||||||
private String operator;
|
private String operator;
|
||||||
|
//新增薪资模板属性
|
||||||
|
private String salaryTemplate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
|
|||||||
@@ -74,6 +74,8 @@ public class OaSalaryMasterVo {
|
|||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "备注")
|
@ExcelProperty(value = "备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
//新增薪资模板属性
|
||||||
|
private String salaryTemplate;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ public class SalaryStringConverter {
|
|||||||
masterBo.setCashier(requestDto.getCashier());
|
masterBo.setCashier(requestDto.getCashier());
|
||||||
masterBo.setDeptManager(requestDto.getDeptManager());
|
masterBo.setDeptManager(requestDto.getDeptManager());
|
||||||
masterBo.setOperator(requestDto.getOperator());
|
masterBo.setOperator(requestDto.getOperator());
|
||||||
|
masterBo.setSalaryTemplate(requestDto.getSalaryTemplate());
|
||||||
masterBo.setRemark(requestDto.getRemark());
|
masterBo.setRemark(requestDto.getRemark());
|
||||||
|
|
||||||
// 转换明细列表
|
// 转换明细列表
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<result property="cashier" column="cashier"/>
|
<result property="cashier" column="cashier"/>
|
||||||
<result property="deptManager" column="dept_manager"/>
|
<result property="deptManager" column="dept_manager"/>
|
||||||
<result property="operator" column="operator"/>
|
<result property="operator" column="operator"/>
|
||||||
|
<result property="salaryTemplate" column="salary_template"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user