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 6065cb7e80..df5d353e18 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 @@ -806,6 +806,14 @@ public class CommonContractService extends MybatisBaseService crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); + if (crmResultBean.getSuccess()) { + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + String idNo = crmCustomerTempVo.getIDNumber(); + map.put("carSaleCustomerName",crmCustomerTempVo.getName()); + map.put("carSaleIdNo",idNo); + map.put("carSaleAddr",crmCustomerTempVo.getAddress()); + } //车架号集合 List stringList = new ArrayList<>(); //查询台数 @@ -920,6 +928,14 @@ public class CommonContractService extends MybatisBaseService crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); + if (crmResultBean.getSuccess()) { + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + String idNo = crmCustomerTempVo.getIDNumber(); + map.put("carSaleCustomerName",crmCustomerTempVo.getName()); + map.put("carSaleIdNo",idNo); + map.put("carSaleAddr",crmCustomerTempVo.getAddress()); + } //车架号集合 List stringList = new ArrayList<>(); //查询台数 @@ -1608,6 +1624,14 @@ public class CommonContractService extends MybatisBaseService crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); + if (crmResultBean.getSuccess()) { + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + String idNo = crmCustomerTempVo.getIDNumber(); + map.put("carSaleCustomerName",crmCustomerTempVo.getName()); + map.put("carSaleIdNo",idNo); + map.put("carSaleAddr",crmCustomerTempVo.getAddress()); + } //车架号集合 List stringList = new ArrayList<>(); //查询台数 @@ -1701,6 +1725,14 @@ public class CommonContractService extends MybatisBaseService crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); + if (crmResultBean.getSuccess()) { + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + String idNo = crmCustomerTempVo.getIDNumber(); + map.put("carSaleCustomerName",crmCustomerTempVo.getName()); + map.put("carSaleIdNo",idNo); + map.put("carSaleAddr",crmCustomerTempVo.getAddress()); + } //车架号集合 List stringList = new ArrayList<>(); //查询台数 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl index dee47c60d4..ae07944817 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl @@ -1151,7 +1151,12 @@ - + <#-- --> + <#if carSaleCustomerName??> + ${carSaleCustomerName!} + <#else> + + @@ -1214,7 +1219,12 @@ - + <#-- --> + <#if carSaleIdNo??> + ${carSaleIdNo!} + <#else> + + @@ -1278,7 +1288,12 @@ - + <#-- --> + <#if carSaleAddr??> + ${carSaleAddr!} + <#else> + + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl index 64abc9ceb2..9c8bb2042a 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl @@ -1084,7 +1084,12 @@ - + <#-- --> + <#if carSaleCustomerName??> + ${carSaleCustomerName!} + <#else> + + @@ -1153,7 +1158,12 @@ - + <#-- --> + <#if carSaleIdNo??> + ${carSaleIdNo!} + <#else> + + @@ -1223,7 +1233,12 @@ - + <#-- --> + <#if carSaleAddr??> + ${carSaleAddr!} + <#else> + + 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 e090caba5a..ad8b50bc6e 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 @@ -1039,7 +1039,12 @@ - + <#-- --> + <#if carSaleCustomerName??> + ${carSaleCustomerName!} + <#else> + + @@ -1102,7 +1107,12 @@ - + <#-- --> + <#if carSaleIdNo??> + ${carSaleIdNo!} + <#else> + + @@ -1166,7 +1176,12 @@ - + <#-- --> + <#if carSaleAddr??> + ${carSaleAddr!} + <#else> + + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index a4ad177723..6473376455 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -1166,7 +1166,12 @@ - + <#-- --> + <#if carSaleCustomerName??> + ${carSaleCustomerName!} + <#else> + + @@ -1229,7 +1234,12 @@ - + <#-- --> + <#if carSaleIdNo??> + ${carSaleIdNo!} + <#else> + + @@ -1293,7 +1303,12 @@ - + <#-- --> + <#if carSaleAddr??> + ${carSaleAddr!} + <#else> + +