From ca849102b2d6928b352bf9d2d7a6dbd0f5deb211 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 20 Oct 2025 17:09:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=E9=A1=B9=E7=9B=AE=E7=9B=88=E4=BA=8F?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在ProjectProfitLossVO中添加customerId字段 - 更新SysOaProjectMapper.xml映射文件以包含客户ID - 支持项目盈亏查询中关联客户信息- 为后续客户维度分析提供数据基础 --- .../main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java | 2 ++ ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml | 1 + 2 files changed, 3 insertions(+) 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