家访准备车辆及上装采购合同生成优化

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

@@ -1563,6 +1563,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         } else if (x) {
             map.put("qddd", finCompanyInvoicingDetailsVo.getAddress().substring(0, finCompanyInvoicingDetailsVo.getAddress().indexOf("县") + 1));
         }
+        //查询销售订单的信息
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(printConfirmDto.getBusSid());
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
+        //查询金融方案挂车信息
+        SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(printConfirmDto.getBusSid()).getData();
         //合同补充信息
         HomeKcCust homeKcCust = printConfirmDto.getHomeKcCust();
         if ("0".equals(homeKcCust.getIsCompBuy())) {
@@ -1570,23 +1576,19 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             map.put("dyz", "☑");
             //第二种
             map.put("dez", "□");
+            //上装成交价/挂车成交价
+            map.put("je", "_____");
         } else if ("1".equals(homeKcCust.getIsCompBuy())) {
             //第一种
             map.put("dyz", "□");
             //第二种
             map.put("dez", "☑");
-        }
-        //查询销售订单的信息
-        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(printConfirmDto.getBusSid());
-        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
-        AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
-        //查询金融方案挂车信息
-        SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(printConfirmDto.getBusSid()).getData();
-        //上装成交价/挂车成交价
-        if (topInfo != null) {
-            map.put("je", topInfo.getTopPrice());
-        }else if (solutionsDetailsVo.isTrailerAmountCb()){
-            map.put("je", solutionsDetailsVo.getTrailerAmount());
+            //上装成交价/挂车成交价
+            if (topInfo != null) {
+                map.put("je", topInfo.getTopPrice());
+            }else if (solutionsDetailsVo.isTrailerAmountCb()){
+                map.put("je", solutionsDetailsVo.getTrailerAmount());
+            }
         }
         List<String> urls = new ArrayList<>();
         if ("001".equals(conSetUpKey)) {
@@ -1595,8 +1597,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicle.getLoanContractSid()).getData();
                 //消贷合同编号
                 map.put("con", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-                //消贷合同编号
-                map.put("con1", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+                if ("0".equals(homeKcCust.getIsCompBuy())) {
+                    //消贷合同编号
+                    map.put("con1", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+                }else {
+                    //消贷合同编号
+                    map.put("con1", "_____");
+                }
                 InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cljszcght" + ".ftl");
                 //生成word文件名
                 String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -1619,8 +1626,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicles.get(0).getLoanContractSid()).getData();
             //消贷合同编号
             map.put("con", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-            //消贷合同编号
-            map.put("con1", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+            if ("0".equals(homeKcCust.getIsCompBuy())) {
+                //消贷合同编号
+                map.put("con1", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+            }else {
+                //消贷合同编号
+                map.put("con1", "_____");
+            }
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cljszcght" + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();