From c995788d23b54a51e00225ab2cf9fe2d90c07de1 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 9 Sep 2025 13:46:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E5=85=AC=E5=8F=B8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SysOaFinance、SysOaFinanceBo、SysOaFinanceVo 中添加 signingCompany 字段
- 在 SysOaFinanceMapper.xml 中添加 signing_company 列的映射
---
 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java    | 2 ++
 .../src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java    | 2 ++
 .../src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java    | 2 ++
 ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml    | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
index 72f8af4..7e0fe2e 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
@@ -124,4 +124,6 @@ public class SysOaFinance extends BaseEntity {
      * 完成状态
      */
     private Long status;
+    //签约公司
+    private String signingCompany;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java
index 9a0a6de..c721f63 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java
@@ -139,5 +139,7 @@ public class SysOaFinanceBo extends BaseEntity {
      * 完成状态
      */
     private Long status;
+    //签约公司
+    private String signingCompany;
 
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
index da62bb9..53b03f3 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
@@ -167,5 +167,7 @@ public class SysOaFinanceVo extends SysOaFinance {
      * 完成状态
      */
     private Long status;
+    //签约公司
+    private String signingCompany;
 
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml
index 2c144af..0720183 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml
@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="month" column="month"/>
         <result property="paymentProgressId" column="payment_progress_id"/>
         <result property="status" column="status"/>
+        <result property="signingCompany" column="signing_company"/>
 
         <result property="receiveAccountId" column="receive_account_id"/>
         <result property="receiveAccountName" column="receive_account_name"/>
@@ -85,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                b.price,
                b.big_price,
                b.remark as detail_remark
+               b.signing_company as signingCompany,
         from sys_oa_finance sof
                  left join sys_oa_detail b on sof.finance_id = b.finance_id
     </sql>