1.0.74 合同加字段交付启动期限

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")

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<ErpContractMaterialVo> contractMaterials = contractInfo.getContractMaterialList();
-        // 付款方式
+        // 付款方式明细
         List<ErpContractPaymentMethodVo> 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);

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;
+
     /**
      * 质保期（天）
      */

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;
+
     /**
      * 质保期（天）
      */

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)
+    @ExcelProperty(value = "质保期")
-    @ExcelDictFormat(readConverterExp = "天=")
     private Long warrantyPeriod;
 
     /**

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,