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