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