diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java index be9954c..bf2ac52 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java @@ -32,5 +32,7 @@ public class ProjectProfitLossVO { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal profitLoss; //盈亏金额 // ...其他字段 + //签约公司 + private Integer signingCompany; } \ No newline at end of file diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml index 155bc39..1785d04 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml @@ -833,6 +833,7 @@ p.project_status, p.funds AS original_funds, p.remark AS project_remark, + p.signing_company AS signingCompany, COALESCE(finance_details.total_income, 0) AS detail_income, COALESCE(finance_details.total_expenditure, 0) AS total_expenditure, CASE