feat(oa): 添加薪资状态字段支持

- 在 OaSalaryMaster 实体类中新增 salaryStatus 字段- 在 OaSalaryMasterBo 业务对象中新增 salaryStatus 字段- 在 OaSalaryMasterMapper.xml 中映射 salaryStatus 字段- 在 OaSalaryMasterServiceImpl 中增加 salaryStatus 查询条件
- 在 OaSalaryMasterVo 视图对象中新增 salaryStatus 字段并添加注释说明
This commit is contained in:
2025-10-15 09:23:24 +08:00
parent 83886a412e
commit 0717f05cf6
5 changed files with 10 additions and 0 deletions

View File

@@ -67,4 +67,6 @@ public class OaSalaryMaster extends BaseEntity {
@TableLogic
private Long delFlag;
private Integer salaryStatus;
}

View File

@@ -75,4 +75,6 @@ public class OaSalaryMasterBo extends BaseEntity {
//新增薪资模板属性
private String salaryTemplate;
private Integer salaryStatus;
}

View File

@@ -76,6 +76,10 @@ public class OaSalaryMasterVo {
private String remark;
//新增薪资模板属性
private String salaryTemplate;
/**
* 状态0-未生成1-已生成2-已审核
*/
private Integer salaryStatus;
}

View File

@@ -74,6 +74,7 @@ public class OaSalaryMasterServiceImpl implements IOaSalaryMasterService {
lqw.eq(StringUtils.isNotBlank(bo.getCashier()), OaSalaryMaster::getCashier, bo.getCashier());
lqw.eq(StringUtils.isNotBlank(bo.getDeptManager()), OaSalaryMaster::getDeptManager, bo.getDeptManager());
lqw.eq(StringUtils.isNotBlank(bo.getOperator()), OaSalaryMaster::getOperator, bo.getOperator());
lqw.eq(bo.getSalaryStatus() != null, OaSalaryMaster::getSalaryStatus, bo.getSalaryStatus());
return lqw;
}

View File

@@ -14,6 +14,7 @@
<result property="deptManager" column="dept_manager"/>
<result property="operator" column="operator"/>
<result property="salaryTemplate" column="salary_template"/>
<result property="salaryStatus" column="salary_status"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>