From ac626b36360cf01ea12bb6ae540b9942f959967c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 19 Apr 2022 15:24:13 +0800 Subject: [PATCH] =?UTF-8?q?pdf=E8=BD=ACword=E6=9E=9A=E4=B8=BE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java | 2 +- .../anrui/base/biz/commoncontract/CommonContractService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java index f5fbef4a01..a1d9e21a4a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java @@ -10,7 +10,7 @@ public enum ContractTemplateEnum { CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同（现车）"), CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同（现车）（空）"), // 空白 - CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同（订车）"), + CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同(订车)"), CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同（订车）（空）"), // 空白 CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"), VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"), diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 85e814a825..dc7a5f3fd9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -581,7 +581,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { Map map = new HashMap(); // 合同信息 - CommonContract contract = fetchBySid(dto.getSid()); + CommonContract contract = new CommonContract();//fetchBySid(dto.getSid()); map.put("partyA", contract.getPartyA()); // 甲方 map.put("partyB", contract.getPartyB()); // 乙方 map.put("contractNo", contract.getContractNo()); // 合同编号