From 1d00151e83733a3da1090c461191c27eea0496c2 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 11 May 2026 17:09:49 +0800 Subject: [PATCH] =?UTF-8?q?1.1.31=20=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=B8=81=E7=A7=8D=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java | 5 +++++ .../main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java index 02d6102c..8a81e3c8 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java @@ -315,6 +315,11 @@ public class ErpProjectInfoVo implements Serializable { */ private Long finalCustomerId; + /** + * 合同结算币种（关联 erp_contract_info，列表/下拉查询带出） + */ + private String settlementCurrency; + /** * 合同跟进人名称 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml index 73e717b5..1bff226b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml @@ -59,7 +59,8 @@ c.contract_code contractCode, c.contract_name contractName, c.customer_contract_code customerContractCode, - c.final_customer_id finalCustomerId + c.final_customer_id finalCustomerId, + c.settlement_currency settlementCurrency from erp_project_info t left join erp_project_type t1 on t1.project_type_id = t.project_type_id left join erp_project_type t2 on t1.parent_id = t2.project_type_id