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 bf2ac52..9830ff5 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 @@ -15,6 +15,8 @@ public class ProjectProfitLossVO { private Integer tradeType; private Date beginTime; private String projectStatus; + //客户id + private Long customerId; @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal originalFunds; // 原始合同金额 private String projectRemark; // 项目备注(用于判断币种) diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml index 171830b..848d7f0 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml @@ -845,6 +845,7 @@ p.funds AS original_funds, p.remark AS project_remark, p.signing_company AS signingCompany, + p.customer_id AS customerId, COALESCE(finance_details.total_income, 0) AS detail_income, COALESCE(finance_details.total_expenditure, 0) AS total_expenditure, CASE