1.1.20 销售合同审批表优化金额、客户名称显示等信息

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java

@@ -501,12 +501,23 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
         data.put("合同名称", strVal(contractInfo.getContractName()));
         data.put("客户合同编号", strVal(contractInfo.getCustomerContractCode()));
         data.put("合同签订日期", formatWordDate(contractInfo.getContractDate()));
-        data.put("合同总价", contractInfo.getTotalPrice() == null ? "" : contractInfo.getTotalPrice().toPlainString());
+        data.put("合同金额", contractInfo.getTotalPrice() == null ? "" : contractInfo.getTotalPrice().toPlainString());
         data.put("甲方公司", strVal(contractInfo.getOneCustomerName()));
         data.put("乙方公司", strVal(contractInfo.getTwoCustomerName()));
         data.put("合同负责人", strVal(contractInfo.getContractManagerName()));
         data.put("所属部门", strVal(contractInfo.getDeptName()));
         data.put("付款方式", strVal(contractInfo.getPaymentMethod()));
+        // 付款方式明细
+        List<ErpContractPaymentMethodVo> contractPaymentMethodList = contractInfo.getContractPaymentMethodList();
+        if (!contractPaymentMethodList.isEmpty()) {
+            String paymentMethodDetails = contractPaymentMethodList.stream()
+                    .map(ErpContractPaymentMethodVo::getPaymentDescription)
+                    .collect(Collectors.joining("\n"));
+            data.put("付款条款", strVal(paymentMethodDetails));
+        } else {
+            data.put("付款条款", strVal(""));
+        }
+
         data.put("付款账户信息", strVal(contractInfo.getPaymentAccountInfo()));
         data.put("合同类型", strVal(contractInfo.getContractType()));
         data.put("合同大类", strVal(contractInfo.getContractCategory()));
@@ -519,7 +530,6 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
         data.put("项目号", strVal(contractInfo.getProjectContractCode()));
         String deliveryPeriod = strVal(contractInfo.getDeliveryStart());
         data.put("发货/交货期", deliveryPeriod);
-        data.put("交付启动期限", deliveryPeriod);
         data.put("质保期", strVal(contractInfo.getWarrantyPeriod()));
         data.put("质保期描述", strVal(contractInfo.getWarrantyPeriodDescription()));