出门证模板调整

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -1082,10 +1082,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         //出门证
         BusExitPermitVo permitVo = new BusExitPermitVo();
         if (null != busHandover) {
-            if (StringUtils.isNotBlank(busHandover.getPayTypeValue())) {
-                if ("全款".equals(busHandover.getPayTypeValue())) {
+            if (StringUtils.isNotBlank(busHandover.getPayTypeKey())) {
+                if ("1".equals(busHandover.getPayTypeKey())) {
                     permitVo.setReason("全款交车");
-                } else if ("贷款".equals(busHandover.getPayTypeValue())) {
+                } else if ("2".equals(busHandover.getPayTypeKey())) {
                     permitVo.setReason("消贷交车");
                 }
             }
@@ -1196,8 +1196,8 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String s2 = exitPermitCreatePdf(permitVo);
         String s3 = commonCreatePdf(pdfVo);
         filePaths.add(s1);
-        filePaths.add(s2);
         filePaths.add(s3);
+        filePaths.add(s2);
         return rb.success().setData(filePaths);
     }
 
@@ -1298,7 +1298,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         }
         dataMap.put("newList", newList);
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vehicledatahandover.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vinDataHandover.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1333,11 +1333,11 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         dataMap.put("vinNo", pdfVo.getVinNo());
         dataMap.put("reason", pdfVo.getReason());
         dataMap.put("operator", pdfVo.getOperator());
-        dataMap.put("finOperator", pdfVo.getFinOperator());
+        dataMap.put("finOperator", "");
         dataMap.put("carCollector", pdfVo.getCarCollector());
         dataMap.put("signature", pdfVo.getSignature());
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/outdoor.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/exitPermit.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");