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 f28df48..8b7c374 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 @@ -67,4 +67,6 @@ public class OaSalaryMaster extends BaseEntity { @TableLogic private Long delFlag; + private Integer salaryStatus; + } 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 430e249..aa5a430 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 @@ -75,4 +75,6 @@ public class OaSalaryMasterBo extends BaseEntity { //新增薪资模板属性 private String salaryTemplate; + private Integer salaryStatus; + } 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 30399d2..c58ade6 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 @@ -76,6 +76,10 @@ public class OaSalaryMasterVo { private String remark; //新增薪资模板属性 private String salaryTemplate; + /** + * 状态:0-未生成,1-已生成,2-已审核 + */ + private Integer salaryStatus; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java index 40a0483..e73f947 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java @@ -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; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml index cd6936c..c21b49e 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMasterMapper.xml @@ -14,6 +14,7 @@ +