Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java

@@ -47,4 +47,6 @@ public class PrintConfirmDto implements Dto {
 
     @ApiModelProperty("甲方主体")
     private String createOrgName;
+    @ApiModelProperty("预估报价方案")
+    private String revalencySchemeKey;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -637,12 +637,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
                         }
                         stkInStock.setFInStockEntry(fInStockEntry);
-                        //推送财务供应商信息
-                        BdSupplier bdSupplier = new BdSupplier();
-                        bdSupplier.setFName(sysOrganizationDC.getName());
-                        bdSupplier.setFLocMobile("13333333333");
-                        bdSupplier.setFNumber(otherCodeDC);
-                        bdSupplier.setFUseOrgId(orgCodeDR);
                         //推送车辆入库查询
                         ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
                         scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
@@ -674,6 +668,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         if (!save.getSuccess()) {
                             return rb.setMsg("采购入库单查询推送失败");
                         }
+                        //推送财务供应商信息
+                        BdSupplier bdSupplier = new BdSupplier();
+                        bdSupplier.setFName(sysOrganizationDC.getName());
+                        bdSupplier.setFLocMobile("13333333333");
+                        bdSupplier.setFNumber(otherCodeDC);
+                        bdSupplier.setFUseOrgId(orgCodeDR);
                         finKingDeeFeign.draftBdSupplier(bdSupplier);
                         finKingDeeFeign.draftStkInStock(stkInStock);
                     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java

@@ -275,13 +275,13 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
             return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
         }
         FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
-        FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
+        FinBillApplication finBillApplication = null;
         if (finBillVehicleDetailsVo == null) {
             return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
         } else {
             String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
-            finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
-            if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
+            finBillApplication = finBillApplicationFeign.fetchBySid(billAppSid).getData();
+            if (!finBillApplication.getNodeState().equals("已办结")) {
                 return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
             }
         }
@@ -301,13 +301,13 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
         //发起日期
         baseTrailerOutApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
         //合同编号
-        baseTrailerOutApplyDetailsVo.setContractNo(finBillApplicationDetailsVo.getContractNo());
+        baseTrailerOutApplyDetailsVo.setContractNo(finBillApplication.getContractNo());
         //客户信息
-        baseTrailerOutApplyDetailsVo.setCustomerSid(finBillApplicationDetailsVo.getCustomerSid());
-        baseTrailerOutApplyDetailsVo.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
+        baseTrailerOutApplyDetailsVo.setCustomerSid(finBillApplication.getCustomerSid());
+        baseTrailerOutApplyDetailsVo.setCustomerName(finBillApplication.getCustomerName());
         //销售类型
-        baseTrailerOutApplyDetailsVo.setSaleTypeKey(finBillApplicationDetailsVo.getSaleTypeKey());
-        baseTrailerOutApplyDetailsVo.setSaleTypeValue(finBillApplicationDetailsVo.getSaleTypeValue());
+        baseTrailerOutApplyDetailsVo.setSaleTypeKey(finBillApplication.getSaleTypeKey());
+        baseTrailerOutApplyDetailsVo.setSaleTypeValue(finBillApplication.getSaleTypeValue());
         //主车信息
         baseTrailerOutApplyDetailsVo.setZcSid(vehSid);
         baseTrailerOutApplyDetailsVo.setZcVinNo(baseVehicle.getVinNo());
@@ -315,12 +315,12 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
         baseTrailerOutApplyDetailsVo.setGcSid(query.getSid());
         baseTrailerOutApplyDetailsVo.setGcVinNo(baseTrailer.getVinNo());
         //业务状态
-        baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
+        baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplication.getBillStateValue());
         //开票名称
         baseTrailerOutApplyDetailsVo.setOpenTickSid(finBillVehicleDetailsVo.getOpenTickSid());
         baseTrailerOutApplyDetailsVo.setOpenTickName(finBillVehicleDetailsVo.getOpenTickName());
         //开票单位
-        baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
+        baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
         //开票类型
         baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
         baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillVehicleDetailsVo.getBillTypeValue());
@@ -335,7 +335,7 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
         String billNo = getApplyCode(baseVehicle.getPurchaseSystemSid());
         baseTrailerOutApplyDetailsVo.setBillNo(billNo);
         //销售订单sid
-        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
         baseTrailerOutApplyDetailsVo.setOrderSid(busSalesOrder.getSid());
         //合格证附件
         List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
+import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
@@ -1010,7 +1011,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(appDto.getContractNo()).getData();
-        if ("2".equals(busSalesOrder.getFinancePlan())) {
+        if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(appDto.getContractNo(), baseVehicle.getSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
             if (StringUtils.isNotBlank(otherReceivableMoney)) {
@@ -1653,6 +1654,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
+            //推送其他应收单
+            for (BaseVehicleZSOutDto zcDto : zcDtos) {
+                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
+                if (otherReceivable != null) {
+                    finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
+                }
+            }
         }
         //推送销售专员信息
         BDEmpinfo bdEmpinfo = new BDEmpinfo();
@@ -1717,10 +1725,40 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
+    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto) {
+        OtherReceivable otherReceivableOne = new OtherReceivable();
+        otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo());
+        otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo());
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData();
+        otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+        otherReceivableOne.setBussDate(DateUtil.formatDate(new Date()));
+        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+        OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto();
+        SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData();
+        collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode());
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
+        if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
+            String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
+            if (StringUtils.isNotBlank(otherReceivableMoney)) {
+                collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
+            } else {
+                return null;
+            }
+        }
+        collectionDetailDtoListOne.add(collectionDetailDtoOne);
+        otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
+        return otherReceivableOne;
+    }
+
     private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
-        salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
+        if (StringUtils.isNotBlank(temporaryNumGcOrSz)){
+            salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
+        }else {
+            salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
+        }
         //日期
         salOutStock.setFDate(DateUtil.today());
         //分公司id
@@ -1752,7 +1790,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             fEntity.setFPrice(dto.getPrice());
             if ("002".equals(dto.getMaterialTypeKey())) {
                 //物料编码
-                fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "G");
+                fEntity.setFMaterialID(dto.getMaterialCode());
             } else if ("003".equals(dto.getMaterialTypeKey())) {
                 //物料编码
                 fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "SZ");
@@ -1858,7 +1896,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }
             }
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
-            if ("2".equals(busSalesOrder.getFinancePlan())) {
+            if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicle.getSid()).getData();
                 String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
                 if (StringUtils.isNotBlank(otherReceivableMoney)) {
@@ -2127,11 +2165,22 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         String payTypeKey = baseVehicleOutApply.getSaleTypeKey();
         if ("001".equals(payTypeKey)) {//全款
+            //挂车单独出库重推
+            if (zcDtos.size() == 0) {
+                if (gcOrSzDtos.size() > 0) {
+                    SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, "");
+                    ResultBean<String> resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    return rb.success();
+                }
+            }
+            int x = 1;
+            String temporaryNumZc = String.format("%02d", x);
             //推送所有主车销售出库单
             SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
             finKingDeeFeign.draftSalOutStock(salOutStock);
-            int x = 1;
-            String temporaryNumZc = String.format("%02d", x);
             //推送所有上装或挂车销售出库单
             if (gcOrSzDtos.size() > 0) {
                 SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
@@ -2139,6 +2188,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         } else {//贷款
             List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
+            //挂车单独出库重推
+            if (zcDtosDK.size() == 0) {
+                if (gcOrSzDtos.size() > 0) {
+                    SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, "");
+                    ResultBean<String> resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    return rb.success();
+                }
+            }
             int j = 0;
             for (BaseVehicleOut vehicleOut : zcDtosDK) {
                 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
@@ -2163,6 +2223,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }
             }
         }
+
         return rb.success();
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -72,6 +72,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
+import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -196,6 +198,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
 
     @Autowired
     private BusVehicleInformationFeign busVehicleInformationFeign;
+    @Autowired
+    private LoanTemplateFeign loanTemplateFeign;
 
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
@@ -1143,6 +1147,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return url;
     }
 
+    private String getRisk(AppOrderDetailsVo appOrderDetailsVo, PrintConfirmDto dto) {
+        LoanTemplateQuotationQuery loanTemplateQuotationQuery = new LoanTemplateQuotationQuery();
+        loanTemplateQuotationQuery.setSalesOrderSid(appOrderDetailsVo.getBusSalesOrderSid());
+        loanTemplateQuotationQuery.setRevalencySchemeKey(dto.getRevalencySchemeKey());
+        ResultBean<String> resultBean = loanTemplateFeign.templateQuotationCreatePdf(loanTemplateQuotationQuery);
+        return resultBean.getData();
+    }
+
     /**
      * 生成 客户开票申请书 pdf
      *

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue

@@ -382,6 +382,33 @@ export default {
 
 <style scoped>
 .titwu {
-  padding-bottom: 0;
+  padding: 0;
+}
+.tableTitle{
+  border: 1px solid #e0e3eb;
+  line-height: 42px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 18px;
+}
+.balanceStyle {
+  line-height: 15px !important;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
 }
 </style>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -102,6 +102,11 @@ public interface FinBillApplicationFeign {
     @ResponseBody
     public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinBillApplication> fetchBySid(@PathVariable("sid") String sid);
+
     @ApiOperation("生成欠款申请PDF")
     @PostMapping("/createPdf")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -96,6 +96,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 		return rb.setMsg("接口anrui-fin/finbillapplication/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<FinBillApplication> fetchBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<String> createPdf(String sid, String userName) {
 		return null;

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

@@ -121,6 +121,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<FinBillApplication> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(sid);
+        return rb.success().setData(finBillApplication);
+    }
+
     @Override
     public ResultBean<String> createPdf(String sid, String userName) {
         return finBillApplicationService.createPdf(sid,userName);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java

@@ -17,4 +17,10 @@ public class LoanHomeVisitInvestigateNewDetailsVo implements Vo {
     private List<FinanceForm> transInfo;
     @ApiModelProperty("资产情况")
     private List<FinanceForm> zCInfo;
+    @ApiModelProperty("订单信息")
+    private List<FinanceForm> orderInfo;
+    @ApiModelProperty("通过/不通过")
+    private String agree;
+    @ApiModelProperty("意见")
+    private String comment;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateInfoVo.java

@@ -0,0 +1,78 @@
+package com.yxt.anrui.riskcenter.api.loantemplate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class AppLoanTemplateInfoVo {
+
+    @ApiModelProperty("政策名称")
+    private String policyName;
+
+    @ApiModelProperty("预计应收合计")
+    private String receivableTotal;
+
+
+    @ApiModelProperty("车型名称")
+    private String vehModel;
+
+    @ApiModelProperty("车型sid")
+    private String vehModelSid;
+
+    @ApiModelProperty("配置sid")
+    private String vehModelConfigSid;
+
+    @ApiModelProperty("融资项目")
+    private String mainVehicleAmount;
+
+    @ApiModelProperty("融资项目首付")
+    private String loanDownPay;
+
+    @ApiModelProperty("贷款保证金")
+    private String bondAmounts;
+
+    @ApiModelProperty("服务费")
+    private String serviceAmount;
+
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+
+    @ApiModelProperty("代收购置税")
+    private String proxyPurchasetax;
+
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+
+    @ApiModelProperty("其他费用")
+    private String otherAmount;
+
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+
+    @ApiModelProperty("总期数")
+    private String loanPeriod;
+
+    @ApiModelProperty("前X期数")
+    private String times;
+    @ApiModelProperty("前X期数月还")
+    private String previousRepay;
+    @ApiModelProperty("剩余期数月还")
+    private String monthlyRepay;
+
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.riskcenter.api.loantemplate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class AppLoanTemplateQuery implements Query {
+    private static final long serialVersionUID = -4947693491448930731L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("机构全组织机构")
+    private String orgPath;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.api.loantemplate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class AppLoanTemplateVo implements Vo {
+    private static final long serialVersionUID = -2494992540171473915L;
+
+    @ApiModelProperty("模板名称")
+    private String templateName;
+    @ApiModelProperty("单台指导价")
+    private String vehPrice;
+    @ApiModelProperty("备案日期")
+    private String filingDate;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("方案1-4，0-3")
+    private int plan;
+
+    private String sid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateFeign.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.riskcenter.api.loantemplate;
 
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
@@ -89,5 +91,12 @@ public interface LoanTemplateFeign {
     @PostMapping("/templateQuotationCreatePdf")
     ResultBean<String> templateQuotationCreatePdf(@RequestBody LoanTemplateQuotationQuery query);
 
+    @ApiOperation("app金融产品公司定制")
+    @PostMapping("getCustomizedList")
+    ResultBean<PagerVo<AppLoanTemplateVo>> getCustomizedList(@RequestBody PagerQuery<AppLoanTemplateQuery> pagerQuery);
+
+    @ApiOperation("app金融产品公司定制详情")
+    @GetMapping("getCustomizedInfo")
+    ResultBean<AppLoanTemplateInfoVo> getCustomizedInfo(@RequestParam("sid") String sid);
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1140,6 +1140,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean<LoanHomeVisitInvestigateNewDetailsVo> details(String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = new LoanHomeVisitInvestigateNewDetailsVo();
+        LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
         List<FinanceForm> userInfo = new ArrayList<>();
         FinanceForm financeForm1 = new FinanceForm();
         financeForm1.setValue("借款人");
@@ -1401,10 +1402,21 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         FinanceForm financeForm51 = new FinanceForm();
         financeForm51.setValue("其他收入来源：" + loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue());
         zCInfo.add(financeForm51);
+        LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
+        List<FinanceForm> orderInfo = new ArrayList<>();
+        FinanceForm financeForm52 = new FinanceForm();
+        financeForm52.setValue("车辆信息确认");
+        financeForm52.setSpanSize(2);
+        financeForm52.setType(1);
+        financeForm52.setBold(true);
+        orderInfo.add(financeForm52);
         loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo);
         loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo);
         loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo);
         loanHomeVisitInvestigateNewDetailsVo.setZCInfo(zCInfo);
+        loanHomeVisitInvestigateNewDetailsVo.setOrderInfo(orderInfo);
+        loanHomeVisitInvestigateNewDetailsVo.setAgree(loanHomevisitInvestigate.getInvestigateValue());
+        loanHomeVisitInvestigateNewDetailsVo.setComment(loanHomevisitInvestigate.getRemarks());
         return rb.success().setData(loanHomeVisitInvestigateNewDetailsVo);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1390,11 +1390,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //月还金额 = 总月还/贷款月还
         loanPayMoneyAll = loanPayMoneyAll.setScale(0, BigDecimal.ROUND_HALF_UP);
         String monthlyRepay = "";
-        if (loanPeriod.equals(otherPolicyPeriod)) {
-            monthlyRepay = loanPayMoneyAll.toString() + "/-";
-        } else {
-            monthlyRepay = loanPayMoneyAll.toString() + "/" + calculateVo.getLoanPayMoney();
+        if (otherPolicyState) {//包含
+            if (loanPeriod.equals(otherPolicyPeriod)) {
+                monthlyRepay = loanPayMoneyAll.toString() + "/-";
+            } else {
+                monthlyRepay = loanPayMoneyAll.toString() + "/" + calculateVo.getLoanPayMoney();
+            }
+        }else{
+            monthlyRepay = loanPayMoneyAll.toString();
         }
+
         //方案汇总月还金额
         calculateVo.setMonthlyRepay(monthlyRepay);
         //利息总额

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,4 +24,6 @@ public interface LoanTemplateMapper extends BaseMapper<LoanTemplate> {
     int updateFlowFiled(Map<String, Object> map);
 
     int selectBySid(String join);
+
+    IPage<AppLoanTemplateVo> getCustomizedList(IPage<LoanTemplate> page, @Param(Constants.WRAPPER) QueryWrapper<LoanTemplate> qw, @Param("name") String name);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml

@@ -54,4 +54,24 @@
         where length(nodeState) > 0
           and find_in_set(sid, #{list})
     </select>
+
+    <select id="getCustomizedList" resultType="com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo">
+        select lfp.templateName,lfp.vehPrice,lfp.filingDate,lfp.vehModel,lfp.sid,
+        case lfp.showTypeKey
+        when '001' then '0'
+        when '002' then '1'
+        when '003' then '2'
+        when '004' then '3'
+        end as plan
+        from loan_template lfp
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and lfp.templateName LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+        </where>
+        order by lfp.id desc
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateRest.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loantemplate;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.*;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
@@ -106,4 +107,16 @@ public class LoanTemplateRest implements LoanTemplateFeign {
     public ResultBean<String> templateQuotationCreatePdf(LoanTemplateQuotationQuery query) {
         return loanTemplateService.templateQuotationCreatePdf(query);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppLoanTemplateVo>> getCustomizedList(PagerQuery<AppLoanTemplateQuery> pagerQuery) {
+        ResultBean<PagerVo<AppLoanTemplateVo>> rb = ResultBean.fireFail();
+        PagerVo<AppLoanTemplateVo> pv = loanTemplateService.getCustomizedList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<AppLoanTemplateInfoVo> getCustomizedInfo(String sid) {
+        return loanTemplateService.getCustomizedInfo(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -24,9 +24,12 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto;
@@ -999,4 +1002,69 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
             return path;
         }
     }
+
+    public PagerVo<AppLoanTemplateVo> getCustomizedList(PagerQuery<AppLoanTemplateQuery> pagerQuery) {
+        AppLoanTemplateQuery query = pagerQuery.getParams();
+        QueryWrapper<LoanTemplate> qw = new QueryWrapper<>();
+        if (query != null) {
+            qw.eq("lfp.orgSidPath", query.getOrgPath());
+            qw.eq("lfp.nodeState", "已办结");
+        }
+        IPage<LoanTemplate> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppLoanTemplateVo> pagging = baseMapper.getCustomizedList(page, qw, query.getName());
+        PagerVo<AppLoanTemplateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+
+    }
+
+    public ResultBean<AppLoanTemplateInfoVo> getCustomizedInfo(String sid) {
+        //前X期月还，X为其他融的期数，前X期月还就是主方案月还+其他融的月还。
+        //剩余期数为主的期数-其他融期数。剩余月还为主方案月还。
+        ResultBean<AppLoanTemplateInfoVo> rb = ResultBean.fireFail();
+        AppLoanTemplateInfoVo appLoanTemplateInfoVo = new AppLoanTemplateInfoVo();
+        LoanTemplate loanTemplate = fetchBySid(sid);
+        LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(sid);
+        BeanUtil.copyProperties(loanTemplate, appLoanTemplateInfoVo);
+        BeanUtil.copyProperties(loanSolutions, appLoanTemplateInfoVo);
+        LoanSolutionsOtherpolicy otherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
+        if (otherpolicy != null) {
+            //----------前X期月还/剩余月还-------------
+            if (StringUtils.isNotBlank(otherpolicy.getPeriod())) {
+                String period = otherpolicy.getPeriod();
+                String[] split = period.split("/");
+                //其他融期数
+                String beforePeriod = split[0];
+                //剩余期数
+                String afterPeriod = split[1];
+                //其他融期数为0，且剩余期数不为0，前X期期数为剩余期数。
+                if (beforePeriod.equals("0") && !afterPeriod.equals("0")) {
+                    appLoanTemplateInfoVo.setTimes(afterPeriod);
+                    appLoanTemplateInfoVo.setPreviousRepay(otherpolicy.getMonthlyRepay());
+                } else if (!beforePeriod.equals("0") && afterPeriod.equals("0")) {
+                    //前X期期数不为0，且剩余期数为0，则表示主方案期数与其他融期数一致。前X期为其他融期数，前X期月还为主方案月还+其他融月还
+                    String monthlyRepay = otherpolicy.getMonthlyRepay();
+                    appLoanTemplateInfoVo.setTimes(beforePeriod);
+                    String[] splitMonthlyPepay = monthlyRepay.split("/");
+                    String beforeMoney = splitMonthlyPepay[0];
+                    appLoanTemplateInfoVo.setPreviousRepay(beforeMoney);
+                } else {
+                    //前X期不为0，且剩余期数不为0，则前X期期数为其他融期数，前X期月还为主方案月还+其他融月还。剩余期数为主方案期数-其他融期数，剩余月还为主方案月还。
+                    String monthlyRepay = otherpolicy.getMonthlyRepay();
+                    appLoanTemplateInfoVo.setTimes(beforePeriod);
+                    String[] splitMonthlyPepay = monthlyRepay.split("/");
+                    String beforeMoney = splitMonthlyPepay[0];
+                    String afterMoney = splitMonthlyPepay[1];
+                    appLoanTemplateInfoVo.setPreviousRepay(beforeMoney);
+                    appLoanTemplateInfoVo.setMonthlyRepay(afterMoney);
+                }
+            }
+            //----------预计首期还款日-------------
+            if (StringUtils.isNotBlank(otherpolicy.getReturnTime())) {
+                appLoanTemplateInfoVo.setReturnTime(otherpolicy.getReturnTime());
+            }
+        }
+        LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+        BeanUtil.copyProperties(loanSolutionsDetail, appLoanTemplateInfoVo);
+        return rb.success().setData(appLoanTemplateInfoVo);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -337,10 +337,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             } else {
                 vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
             }
-            String[] updateDates = updateDate.split("-");
-            String[] nowDates = nowDate.split("-");
-            if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])) {
-                vo.setIsNow(true);
+            if (StringUtils.isNotBlank(updateDate)){
+                String[] updateDates = updateDate.split("-");
+                String[] nowDates = nowDate.split("-");
+                if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])) {
+                    vo.setIsNow(true);
+                }
             }
         }
         List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java

@@ -32,4 +32,14 @@ public interface FinancialPolicyFeign {
     @GetMapping("getProductInfo")
     ResultBean<FinancialPolicyDetailsVo> getProductInfo(@RequestParam("sid") String sid);
 
+
+    @ApiOperation("app金融产品公司定制")
+    @PostMapping("getCustomizedList")
+    ResultBean<PagerVo<ProductPolicyVo>> getCustomizedList(@RequestBody PagerQuery<ProductPolicyQuery> pagerQuery);
+
+    @ApiOperation("app金融产品公司定制详情")
+    @GetMapping("getCustomizedInfo")
+    ResultBean<ProductPolicyInfo> getCustomizedInfo(@RequestParam("sid") String sid);
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyInfo.java

@@ -0,0 +1,90 @@
+package com.yxt.anrui.terminal.api.autoservice.financialPolicy;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class ProductPolicyInfo {
+
+    @ApiModelProperty("政策名称")
+    private String policyName;
+
+    @ApiModelProperty("预计应收合计")
+    private String receivableTotal;
+
+
+    @ApiModelProperty("车型名称")
+    @JsonProperty("model")
+    private String vehModel;
+
+    @ApiModelProperty("车型sid")
+    @JsonProperty("modelSid")
+    private String vehModelSid;
+
+    @ApiModelProperty("配置sid")
+    @JsonProperty("configSid")
+    private String vehModelConfigSid;
+
+    @ApiModelProperty("融资项目")
+    @JsonProperty("loanItems")
+    private String mainVehicleAmount;
+
+    @ApiModelProperty("融资项目首付")
+    private String loanDownPay;
+
+    @ApiModelProperty("贷款保证金")
+    @JsonProperty("premium")
+    private String bondAmounts;
+
+    @ApiModelProperty("服务费")
+    private String serviceAmount;
+
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+
+    @ApiModelProperty("代收购置税")
+    private String proxyPurchasetax;
+
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+
+    @ApiModelProperty("其他费用")
+    private String otherAmount;
+
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+
+    @ApiModelProperty("总期数")
+    @JsonProperty("period")
+    private String loanPeriod;
+
+    @ApiModelProperty("前几期")
+    @JsonProperty("monthlyRepay")
+    private String times;
+
+    @ApiModelProperty("前几期月还多少")
+    @JsonProperty("monthlyRepay2")
+    private String previousRepay;
+
+    @ApiModelProperty("剩余期数月还多少")
+    @JsonProperty("loanMonthlyRepay")
+    private String monthlyRepay;
+
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.autoservice.financialPolicy;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class ProductPolicyQuery implements Query {
+    private static final long serialVersionUID = 2053880525747413838L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("机构全组织机构")
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.api.autoservice.financialPolicy;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/4
+ **/
+@Data
+public class ProductPolicyVo implements Vo {
+    private static final long serialVersionUID = 6097174381344736207L;
+    @ApiModelProperty("模板名称")
+    private String templateName;
+    @ApiModelProperty("单台指导价")
+    private String vehPrice;
+    @ApiModelProperty("备案日期")
+    private String filingDate;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("方案1-4，0-3")
+    private int plan;
+
+    private String sid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java

@@ -19,4 +19,7 @@ public class AppFinanceForm {
     //图片
     private List<String> files;
     private List<AppFinanceSonForm> sonForms;
+
+    private Boolean jumpPage = false;
+    private AppLoanHomeVisitVo pluginPage;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java

@@ -11,4 +11,16 @@ public class AppLoanHomeVisitInvestigateDetailsVo implements Vo {
 
     @ApiModelProperty("用户信息")
     private List<AppFinanceForm> userInfo;
+    @ApiModelProperty("营运经历")
+    private List<AppFinanceForm> yYInfo;
+    @ApiModelProperty("运输信息")
+    private List<AppFinanceForm> transInfo;
+    @ApiModelProperty("资产情况")
+    private List<AppFinanceForm> zCInfo;
+    @ApiModelProperty("订单信息")
+    private List<AppFinanceForm> orderInfo;
+    @ApiModelProperty("通过/不通过")
+    private String agree;
+    @ApiModelProperty("意见")
+    private String comment;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.terminal.biz.autoservice.financialPolicy;
 
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyFeign;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo;
+import com.yxt.anrui.terminal.api.autoservice.financialPolicy.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -32,4 +29,14 @@ public class FinancialPolicyRest implements FinancialPolicyFeign {
     public ResultBean<FinancialPolicyDetailsVo> getProductInfo(String sid) {
         return financialPolicyService.getProductInfo(sid);
     }
+
+    @Override
+    public ResultBean<PagerVo<ProductPolicyVo>> getCustomizedList(PagerQuery<ProductPolicyQuery> pagerQuery) {
+        return financialPolicyService.getCustomizedList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<ProductPolicyInfo> getCustomizedInfo(String sid) {
+        return financialPolicyService.getCustomizedInfo(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java

@@ -6,9 +6,11 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery;
-import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo;
+import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateInfoVo;
+import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateQuery;
+import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo;
+import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
+import com.yxt.anrui.terminal.api.autoservice.financialPolicy.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -31,6 +33,8 @@ public class FinancialPolicyService {
 
     @Autowired
     private LoanFinPolicyFeign loanFinPolicyFeign;
+    @Autowired
+    private LoanTemplateFeign loanTemplateFeign;
 
     public ResultBean<PagerVo<FinancialPolicyVo>> getProductList(PagerQuery<FinancialPolicyQuery> pagerQuery) {
         ResultBean<PagerVo<FinancialPolicyVo>> rb = ResultBean.fireFail();
@@ -54,4 +58,27 @@ public class FinancialPolicyService {
         BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo);
         return rb.success().setData(financialPolicyDetailsVo);
     }
+
+    public ResultBean<PagerVo<ProductPolicyVo>> getCustomizedList(PagerQuery<ProductPolicyQuery> pagerQuery) {
+        ResultBean<PagerVo<ProductPolicyVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppLoanTemplateQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppLoanTemplateVo>> resultBean = loanTemplateFeign.getCustomizedList(pq);
+        List<ProductPolicyVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ProductPolicyVo.class)).collect(Collectors.toList());
+        PagerVo<ProductPolicyVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+    }
+
+    public ResultBean<ProductPolicyInfo> getCustomizedInfo(String sid) {
+        ResultBean<ProductPolicyInfo> rb = ResultBean.fireFail();
+        ProductPolicyInfo financialPolicyDetailsVo = new ProductPolicyInfo();
+        ResultBean<AppLoanTemplateInfoVo> resultBean = loanTemplateFeign.getCustomizedInfo(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppLoanTemplateInfoVo appPolicyDetailsVo = resultBean.getData();
+        BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo);
+        return rb.success().setData(financialPolicyDetailsVo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -146,6 +146,11 @@ public class LoanHomeVisitInvestigateService {
         LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData();
         AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo();
         BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo);
+        List<AppFinanceForm> orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo();
+        for (AppFinanceForm appFinanceForm : orderInfo) {
+            appFinanceForm.setJumpPage(true);
+
+        }
         return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo);
     }