From 1ff3ffdd336becb11863a8e3a008be11e4f6017c Mon Sep 17 00:00:00 2001 From: yinq Date: Sat, 28 Feb 2026 10:57:01 +0800 Subject: [PATCH] =?UTF-8?q?1.0.74=20=E5=90=88=E5=90=8C=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BA=A4=E4=BB=98=E5=90=AF=E5=8A=A8=E6=9C=9F=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseTemplateVariableController.java | 5 +++-- .../impl/TemplateVariableAssignServiceImpl.java | 6 +++--- .../dromara/oa/erp/domain/ErpContractInfo.java | 5 +++++ .../oa/erp/domain/bo/ErpContractInfoBo.java | 10 ++++++++++ .../oa/erp/domain/vo/ErpContractInfoVo.java | 15 +++++++++++++-- .../mapper/oa/erp/ErpContractInfoMapper.xml | 1 + 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java index 2d69b575..5b742ad8 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java @@ -119,9 +119,10 @@ public class BaseTemplateVariableController extends BaseController { } /** - * 根据合同信息为模板变量赋值 + * 根据模板类型为模板变量赋值 + * 模板类型：1=合同，2=发货单，3=项目变更，4=报价单 * - * @param request 赋值请求（包含模板类型、合同ID） + * @param request 赋值请求（包含变量名称数组、模板类型、业务ID等） * @return 赋值后的模板变量列表 */ @PostMapping("/assign") diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java index 2e1578ec..af9bd89d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java @@ -94,13 +94,13 @@ public class TemplateVariableAssignServiceImpl implements ITemplateVariableAssig // 合同物料列表 List contractMaterials = contractInfo.getContractMaterialList(); - // 付款方式 + // 付款方式明细 List contractPaymentMethodList = contractInfo.getContractPaymentMethodList(); if (!contractPaymentMethodList.isEmpty()) { - String paymentMethod = contractPaymentMethodList.stream() + String paymentMethodDetails = contractPaymentMethodList.stream() .map(ErpContractPaymentMethodVo::getPaymentDescription) .collect(Collectors.joining("\n")); - contractInfo.setPaymentMethod(paymentMethod); + contractInfo.setPaymentMethodDetails(paymentMethodDetails); } // 为所有模板变量赋值 return buildAssignResultList(allTemplateVariables, variableMap, contractInfo, contractMaterials); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java index ff20aafa..da76b74b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java @@ -167,6 +167,11 @@ public class ErpContractInfo extends TenantEntity { */ private String projectContractCode; + /** + * 交付启动期限 + */ + private Integer deliveryStart; + /** * 质保期（天） */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java index e201f53a..1dc8a392 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java @@ -145,6 +145,11 @@ public class ErpContractInfoBo extends BaseEntity { */ private String paymentMethod; + /** + * 付款方式明细 + */ + private String paymentMethodDetails; + /** * 签字合同附件 */ @@ -170,6 +175,11 @@ public class ErpContractInfoBo extends BaseEntity { */ private String projectContractCode; + /** + * 交付启动期限 + */ + private Integer deliveryStart; + /** * 质保期（天） */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java index f862c69f..9f653dd3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java @@ -183,6 +183,12 @@ public class ErpContractInfoVo implements Serializable { @ExcelProperty(value = "付款方式") private String paymentMethod; + /** + * 付款方式明细 + */ + @ExcelProperty(value = "付款方式明细") + private String paymentMethodDetails; + /** * 签字合同附件 */ @@ -213,11 +219,16 @@ public class ErpContractInfoVo implements Serializable { @ExcelProperty(value = "项目号") private String projectContractCode; + /** + * 交付启动期限 + */ + @ExcelProperty(value = "交付启动期限") + private Integer deliveryStart; + /** * 质保期（天） */ - @ExcelProperty(value = "质保期", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "天=") + @ExcelProperty(value = "质保期") private Long warrantyPeriod; /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml index 6759bedb..14a8aefc 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml @@ -36,6 +36,7 @@ t.external_contract_code, t.order_contract_code, t.project_contract_code, + t.delivery_start, t.warranty_period, t.warranty_period_description, t.delivery_location,