合同

1 year ago · 70f435ea0c
3 changed files with 16 additions and 10 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
@ -825,7 +825,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        String remarks = "";
        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
        if (commonContract != null) {
-            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            String date = DateUtil.today();
            List<String> dateString = Arrays.asList(date.split("-"));
            String year = dateString.get(0);
            String month = dateString.get(1);
@ -939,7 +939,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        String remarks = "";
        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
        if (commonContract != null) {
-            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            String date = DateUtil.today();
            List<String> dateString = Arrays.asList(date.split("-"));
            String year = dateString.get(0);
            String month = dateString.get(1);
@ -1042,7 +1042,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        String ftl = "";
        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
        if (commonContract != null) {
-            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            String date = DateUtil.today();
            List<String> dateString = Arrays.asList(date.split("-"));
            String year = dateString.get(0);
            String month = dateString.get(1);
@ -1132,7 +1132,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        String ftl = "";
        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
        if (commonContract != null) {
-            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            String date = DateUtil.today();
            List<String> dateString = Arrays.asList(date.split("-"));
            String year = dateString.get(0);
            String month = dateString.get(1);
@ -1378,7 +1378,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
        }
        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
        if (commonContract != null) {
-            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            String date =DateUtil.today();
            map.put("date", date);
        }
        List<CarContractListVo> carContractListVos = new ArrayList<>();
--- 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 @@
                        <w:u w:val="single"/>
                    </w:rPr>
                    <#if invoiceName??>
-                        <w:t>${invoiceName!}</w:t>
+                        <w:t>        ${invoiceName!}                                                </w:t>
                        <#else><w:t>                                                                </w:t>
                    </#if>

@ -2407,7 +2407,7 @@
                        <w:u w:val="single"/>
                    </w:rPr>
                    <#if invoiceNo??>
-                        <w:t>${invoiceNo!}</w:t>
+                        <w:t>    ${invoiceNo!}   </w:t>
                        <#else><w:t>                       </w:t>
                    </#if>

--- 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 @@
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
                    <w:rPr>
-                        <w:rFonts w:ascii="宋体" w:fareast="等线" w:h-ansi="宋体" w:hint="fareast"/>
+                        <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                        <wx:font wx:val="宋体"/>
                        <w:sz w:val="20"/>
                        <w:sz-cs w:val="20"/>
@ -2359,7 +2359,10 @@
                        <w:sz-cs w:val="19"/>
                        <w:u w:val="single"/>
                    </w:rPr>
-                    <w:t>        ${invoiceName!}                                                </w:t>
+                    <#if invoiceName??>
+                        <w:t>        ${invoiceName!}                                                </w:t>
+                    <#else><w:t>                                                                </w:t>
+                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
                    <w:rPr>
@ -2402,7 +2405,10 @@
                        <w:sz-cs w:val="19"/>
                        <w:u w:val="single"/>
                    </w:rPr>
-                    <w:t>    ${invoiceNo!}   </w:t>
+                    <#if invoiceNo??>
+                        <w:t>    ${invoiceNo!}   </w:t>
+                    <#else><w:t>                       </w:t>
+                    </#if>
                </w:r>
                <w:r wsp:rsidRPr="000B0934">
                    <w:rPr>