家访准备消贷合同生成调整

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -96,6 +96,6 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
 
     VinListVos selectByBus(@Param("contractNo") String contractId,@Param("vinSid") String s);
 
-    @Select("select * from fin_bill_application where contractNo = #{contractNo}")
+    @Select("select * from fin_bill_application where contractNo = #{contractNo} limit 1")
     FinBillApplicationDetailsVo selectByCon(String contractNo);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -443,7 +443,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
         List<File> filesList = new ArrayList<>();
         //贷款车辆买卖合同
-        List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
+        /*List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);*/
         //生成车辆融资协议
         List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
         //生成还款协议
@@ -476,12 +476,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //生成公司股东会对外担保决议
             gsgddwdbjyUrls = gsgddwdbjy(printConfirmDto, conSetUpKey);
         }
-        if (dkclmmhts != null && dkclmmhts.size() > 0) {
+        /*if (dkclmmhts != null && dkclmmhts.size() > 0) {
             for (String dkclmmht : dkclmmhts) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht);
                 filesList.add(file);
             }
-        }
+        }*/
         if (clrzxyUrls != null && clrzxyUrls.size() > 0) {
             for (String clrzxyUrl : clrzxyUrls) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + clrzxyUrl);
@@ -715,6 +715,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
                 DownCarRegisContract downCarRegisContract = new DownCarRegisContract();
                 downCarRegisContract.setId(i.toString());
+                i= i + 1;
                 BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(salesOrderVehicle.getLinkSid()).getData();
                 downCarRegisContract.setVinNo(baseVehicle.getVinNo());
                 downCarRegisContract.setFdjNo(baseVehicle.getEngineNo());
@@ -804,6 +805,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
                 DownCarRegisContract downCarRegisContract = new DownCarRegisContract();
                 downCarRegisContract.setId(i.toString());
+                i = i + 1;
                 BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(salesOrderVehicle.getLinkSid()).getData();
                 downCarRegisContract.setBrandName(baseVehicle.getCarBrandName());
                 downCarRegisContract.setVinNo(baseVehicle.getVinNo());
@@ -1010,7 +1012,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 //新生成的word路径
                 String wordPath = targetPath + typeName;
                 //生成文件名
-                String pdfName = map.get("con").toString() + "代管车辆委托书_" + dateStr + seconds + ".pdf";
+                String pdfName = map.get("num").toString() + "代管车辆委托书_" + dateStr + seconds + ".pdf";
                 WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
                 urls.add(pdfName);
             }
@@ -1032,7 +1034,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //新生成的word路径
             String wordPath = targetPath + typeName;
             //生成文件名
-            String pdfName = map.get("con").toString() + "代管车辆委托书_" + dateStr + seconds + ".pdf";
+            String pdfName = map.get("num").toString() + "代管车辆委托书_" + dateStr + seconds + ".pdf";
             WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
             urls.add(pdfName);
         }
@@ -1243,13 +1245,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicle.getLoanContractSid()).getData();
                 //消贷合同编号
                 map.put("loanContractNo", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clrzxy1" + ".ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clrzxy" + ".ftl");
                 //生成word文件名
                 String targetPath = docPdfComponent.getUploadTemplateUrl();
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();
                 String typeName = dateStr + seconds + ".doc";
-                File file = new File(targetPath + "clrzxy1" + seconds + ".ftl");
+                File file = new File(targetPath + "clrzxy" + seconds + ".ftl");
                 File dir = new File(targetPath);
                 WordConvertUtils.inputStreamToFile(inputStream, file);
                 WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
@@ -1265,13 +1267,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicles.get(0).getLoanContractSid()).getData();
             //消贷合同编号
             map.put("loanContractNo", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clrzxy1" + ".ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clrzxy" + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
-            File file = new File(targetPath + "clrzxy1" + seconds + ".ftl");
+            File file = new File(targetPath + "clrzxy" + seconds + ".ftl");
             File dir = new File(targetPath);
             WordConvertUtils.inputStreamToFile(inputStream, file);
             WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
@@ -1417,13 +1419,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 map.put("contractNo", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
                 //融资协议合同编号
                 map.put("rzConNo", "R" + busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "hkxy1" + ".ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "hkxy" + ".ftl");
                 //生成word文件名
                 String targetPath = docPdfComponent.getUploadTemplateUrl();
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();
                 String typeName = dateStr + seconds + ".doc";
-                File file = new File(targetPath + "hkxy1" + seconds + ".ftl");
+                File file = new File(targetPath + "hkxy" + seconds + ".ftl");
                 File dir = new File(targetPath);
                 WordConvertUtils.inputStreamToFile(inputStream, file);
                 WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
@@ -1443,13 +1445,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             map.put("contractNo", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
             //融资协议合同编号
             map.put("rzConNo", "R" + busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "hkxy1" + ".ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "hkxy" + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
-            File file = new File(targetPath + "hkxy1" + seconds + ".ftl");
+            File file = new File(targetPath + "hkxy" + seconds + ".ftl");
             File dir = new File(targetPath);
             WordConvertUtils.inputStreamToFile(inputStream, file);
             WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
@@ -1594,13 +1596,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicle.getLoanContractSid()).getData();
                 //消贷合同编号
                 map.put("con1", "H" + busSalesOrderLoancontractDetailsVo.getLoanContractNo() + "《还款协议》");
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "gsgdhdwdbjy1" + ".ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "gsgdhdwdbjy" + ".ftl");
                 //生成word文件名
                 String targetPath = docPdfComponent.getUploadTemplateUrl();
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();
                 String typeName = dateStr + seconds + ".doc";
-                File file = new File(targetPath + "gsgdhdwdbjy1" + seconds + ".ftl");
+                File file = new File(targetPath + "gsgdhdwdbjy" + seconds + ".ftl");
                 File dir = new File(targetPath);
                 WordConvertUtils.inputStreamToFile(inputStream, file);
                 WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
@@ -1616,13 +1618,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicles.get(0).getLoanContractSid()).getData();
             //消贷合同编号
             map.put("con1", "H" + busSalesOrderLoancontractDetailsVo.getLoanContractNo() + "《还款协议》");
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "gsgdhdwdbjy1" + ".ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "gsgdhdwdbjy" + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
-            File file = new File(targetPath + "gsgdhdwdbjy1" + seconds + ".ftl");
+            File file = new File(targetPath + "gsgdhdwdbjy" + seconds + ".ftl");
             File dir = new File(targetPath);
             WordConvertUtils.inputStreamToFile(inputStream, file);
             WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/cldjht.ftl

@@ -179,7 +179,7 @@
                     <w:p>
                         <w:pPr>
                             <w:spacing w:line="340" w:lineRule="exact"/>
-                            <w:ind w:firstLine="5880" w:firstLineChars="2800"/>
+                            <w:ind w:firstLine="4620" w:firstLineChars="2200"/>
                             <w:rPr>
                                 <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"/>
                                 <w:color w:val="auto"/>
@@ -207,6 +207,8 @@
                             </w:rPr>
                             <w:t xml:space="preserve">D${con!}     </w:t>
                         </w:r>
+                        <w:bookmarkStart w:id="0" w:name="_GoBack"/>
+                        <w:bookmarkEnd w:id="0"/>
                     </w:p>
                     <w:p>
                         <w:pPr>
@@ -1059,7 +1061,7 @@
                                 <w:sz w:val="28"/>
                                 <w:szCs w:val="28"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">甲方： 乙方：                     </w:t>
+                            <w:t xml:space="preserve">甲方：                                        乙方：</w:t>
                         </w:r>
                     </w:p>
                     <w:p>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/dgclwts.ftl

@@ -376,7 +376,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${year!}</w:t>
+                            <w:t>${year?c}</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>
@@ -420,7 +420,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">${day!}     </w:t>
+                            <w:t xml:space="preserve">${day!}</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/gsgdhdwdbjy1.ftl → anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/gsgdhdwdbjy.ftl

@@ -638,7 +638,7 @@
                                 <w:sz w:val="24"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${y!}</w:t>
+                            <w:t>${y?c}</w:t>
                         </w:r>
                         <w:bookmarkStart w:id="0" w:name="_GoBack"/>
                         <w:bookmarkEnd w:id="0"/>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jsclqrs.ftl

@@ -1564,7 +1564,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${y!}</w:t>
+                            <w:t>${y?c}</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jsclwts.ftl

@@ -497,7 +497,7 @@
                                 <w:sz w:val="28"/>
                                 <w:szCs w:val="28"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">                                   年 月 日</w:t>
+                            <w:t xml:space="preserve">                           年     月     日</w:t>
                         </w:r>
                     </w:p>
                     <w:p>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/kpsqs.ftl

@@ -757,7 +757,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${y!}</w:t>
+                            <w:t>${y?c}</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>