新车买卖合同模板调整

12 months ago · 28f4b200be
5 changed files with 14 additions and 11 deletions
--- 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
@ -1199,9 +1199,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        map.put("totalPrice", "");
        map.put("priceRemarks", "");
        map.put("depositTotal", "");
-        map.re
-        map.put("carSaleAddr","");
-        map.put("phone","");
+        map.remove("carSaleAddr");
+        map.remove("phone");
        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
        //查询台数
        String num = priceInfo.getNumber();
@ -1304,6 +1303,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        map.put("totalPrice", "");
        map.put("priceRemarks", "");
        map.put("depositTotal", "");
+        map.remove("carSaleAddr");
+        map.remove("phone");
        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
        //查询台数
        String num = priceInfo.getNumber();
@ -1405,6 +1406,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        map.put("totalPrice", "");
        map.put("priceRemarks", "");
        map.put("depositTotal", "");
+        map.remove("carSaleAddr");
+        map.remove("phone");
        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
        //查询台数
        String num = priceInfo.getNumber();
@ -1506,8 +1509,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        map.put("totalPrice", "");
        map.put("priceRemarks", "");
        map.put("depositTotal", "");
-        map.put("carSaleAddr","");
-        map.put("phone","");
+        map.remove("carSaleAddr");
+        map.remove("phone");
        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
        //查询台数
        String num = priceInfo.getNumber();
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl
@ -1176,7 +1176,7 @@
                    <#if carSaleAddr??>
                        <w:t> ${carSaleAddr!}  </w:t>
                    <#else>
-                        <w:t>                                                           </w:t>
+                        <w:t>                     </w:t>
                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
@ -1200,7 +1200,7 @@
                    <#if phone??>
                        <w:t>   ${phone!}   </w:t>
                    <#else>
-                        <w:t>                                                           </w:t>
+                        <w:t>                     </w:t>
                    </#if>
                </w:r>
            </w:p>
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl
@ -1223,7 +1223,7 @@
                        <w:sz-cs w:val="20"/>
                        <w:u w:val="single"/>
                    </w:rPr>
-                    <w:t>                                                           </w:t>
+                    <w:t>                     </w:t>
                </w:r>
                <w:r wsp:rsidRPr="0086369C">
                    <w:rPr>
--- 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
@ -1169,7 +1169,7 @@
                    <#if carSaleAddr??>
                        <w:t> ${carSaleAddr!}  </w:t>
                    <#else>
-                        <w:t>                                                           </w:t>
+                        <w:t>                     </w:t>
                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
@ -1226,7 +1226,7 @@
                    <#if phone??>
                        <w:t>   ${phone!}   </w:t>
                    <#else>
-                        <w:t>                                                           </w:t>
+                        <w:t>                     </w:t>
                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
@ -1304,7 +1304,7 @@
                    <#if adds??>
                        <w:t>${adds!} </w:t>
                    <#else>
-                        <w:t>                                                           </w:t>
+                        <w:t>                     </w:t>
                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="0071392F">