From 0717f05cf651b1b7a410956d27272f36aae07383 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 15 Oct 2025 09:23:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OaSalaryMaster 实体类中新增 salaryStatus 字段- 在 OaSalaryMasterBo 业务对象中新增 salaryStatus 字段- 在 OaSalaryMasterMapper.xml 中映射 salaryStatus 字段- 在 OaSalaryMasterServiceImpl 中增加 salaryStatus 查询条件
- 在 OaSalaryMasterVo 视图对象中新增 salaryStatus 字段并添加注释说明
---
 .../src/main/java/com/ruoyi/oa/domain/OaSalaryMaster.java     | 2 ++
 .../main/java/com/ruoyi/oa/domain/bo/OaSalaryMasterBo.java    | 2 ++
 .../main/java/com/ruoyi/oa/domain/vo/OaSalaryMasterVo.java    | 4 ++++
 .../com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java  | 1 +
 .../src/main/resources/mapper/oa/OaSalaryMasterMapper.xml     | 1 +
 5 files changed, 10 insertions(+)

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 @@
         <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"/>