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 cf3b51daaf..1e7e232c7c 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 @@ -825,7 +825,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -939,7 +939,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1042,7 +1042,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1132,7 +1132,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1378,7 +1378,7 @@ public class CommonContractService extends MybatisBaseService carContractListVos = new ArrayList<>(); diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index 87a42f149d..e090caba5a 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -2360,7 +2360,7 @@ <#if invoiceName??> - ${invoiceName!} + ${invoiceName!} <#else> @@ -2407,7 +2407,7 @@ <#if invoiceNo??> - ${invoiceNo!} + ${invoiceNo!} <#else> diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index cd8833835c..08f2adb5d2 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1160,7 +1160,7 @@ - + @@ -2359,7 +2359,10 @@ - ${invoiceName!} + <#if invoiceName??> + ${invoiceName!} + <#else> + @@ -2402,7 +2405,10 @@ - ${invoiceNo!} + <#if invoiceNo??> + ${invoiceNo!} + <#else> +