Merge remote-tracking branch 'origin/master'

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

@@ -451,19 +451,19 @@ 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);
         //生成还款协议
         List<String> hkxyUrls = hkxy(printConfirmDto, conSetUpKey);
         //代管车辆委托书
-        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/
+        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);
         //判断是否为高低开
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData();
         //查询金融方案
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
         //判断是否为高低开，若是则生成开票申请书
-       /* List<String> kpsqsUrls = new ArrayList<>();
+        List<String> kpsqsUrls = new ArrayList<>();
         if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) {
             //开票申请书
             kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey);
@@ -477,11 +477,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         //接收车辆确认书
         List<String> jsclqrsUrls = jsclqrs(printConfirmDto, conSetUpKey);
         //接收车辆委托书
-        List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);*/
+        List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);
         //销售订单上装信息
         List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
         //查询金融方案中挂车信息
-        /*List<String> cljszcghtUrls = new ArrayList<>();
+        List<String> cljszcghtUrls = new ArrayList<>();
         if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){
             //生成车辆及上装采购合同
             cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
@@ -550,7 +550,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjyUrl);
                 filesList.add(file);
             }
-        }*/
+        }
         //合并pdf文件
         if (filesList.size() > 0) {
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");