diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java index d3c547e83e..017d278874 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java @@ -1,51 +1,81 @@ package com.yxt.anrui.base.api.basevehicleout; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class BaseJRFAVo { + @ApiModelProperty("融资项目") + private String financProject; + @ApiModelProperty("是否显示更多") + @JsonProperty("isShowMore") + private boolean isShowMore; - //金融方案 - @ApiModelProperty("是否打包") + @ApiModelProperty("关联sid") + private String busSid; + @ApiModelProperty("是否打包：1打包，0不打包") private String isPack; - @ApiModelProperty("产品政策") + @ApiModelProperty("产品政策名称") private String policyName; - @ApiModelProperty("融资项目") - private String financProject; + @ApiModelProperty("产品政策sid") + private String policySid; @ApiModelProperty("融资项目总额") private String loanTotal; - @ApiModelProperty("首付比例") + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("配件") + private String accessoriesAmount; + @ApiModelProperty("是否有配件") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("首付款比例") private String downPayRatio; @ApiModelProperty("首付金额") private String downPayAmount; - @ApiModelProperty("产品贷款金额") + @ApiModelProperty("贷款金额") private String loanAmount; - @ApiModelProperty("产品期数") + @ApiModelProperty("贷款期数") private String loanPeriod; - @ApiModelProperty("贷款保证金比例") + @ApiModelProperty("保证金比例") private String bondRatio; - @ApiModelProperty("贷款保证金") + @ApiModelProperty("保证金金额") private String bondAmount; @ApiModelProperty("厂家贴息") private String factoryDiscount; - @ApiModelProperty("贴息用途") + @ApiModelProperty("厂家贴息用途") private String factoryDiscountUse; - @ApiModelProperty("年利率（%）") + @ApiModelProperty("年利率") private String policyYearRatio; - @ApiModelProperty("月还金额") + @ApiModelProperty("贷款月还") private String loanPayMoney; - @ApiModelProperty("利息总额") + @ApiModelProperty("贷款利息") private String loanInterest; @ApiModelProperty("贴息抵车款") private String discountCar; - - //其他融 @ApiModelProperty("是否勾选其它融") private boolean otherPolicyState; + /**************************其他融*********************************/ + private boolean otherPolicyIsMain; @ApiModelProperty("其它融名称") private String otherPolicyName; - @ApiModelProperty("其它融贷款金额") + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融金额") private String otherPolicyAmount; @ApiModelProperty("其它融期数") private String otherPolicyPeriod; @@ -55,12 +85,9 @@ public class BaseJRFAVo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; - - //方案汇总 - @ApiModelProperty("融资首付") + /*************************方案汇总*********************************/ + @ApiModelProperty("'融资首付") private String loanDownPay; - @ApiModelProperty("实际首付比例") - private String downPayAmountsRatio; @ApiModelProperty("总贷款金额") private String loanAmountTotal; @ApiModelProperty("期数") @@ -72,9 +99,11 @@ public class BaseJRFAVo { @ApiModelProperty("预计首期还款日") private String returnTime; - //应收明细 + /***************************金融方案应收明细*******************************/ @ApiModelProperty("融资首付") private String downPayAmounts; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; @ApiModelProperty("贷款保证金") private String bondAmounts; @ApiModelProperty("保险保证金") @@ -97,24 +126,43 @@ public class BaseJRFAVo { private String otherAmountRemark; @ApiModelProperty("办理方式选择") private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; @ApiModelProperty("代收合计") private String proxyTotal; @ApiModelProperty("代收首年保险费") private String proxyPremium; @ApiModelProperty("代收购置费") private String proxyPurchasetax; - @ApiModelProperty("应收合计") - private String receivableTotal; - @ApiModelProperty("抵顶费用合计") - private String offsetTotal; @ApiModelProperty("抵顶首年保险费") private String offsetPremium; @ApiModelProperty("抵顶购置税") private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; @ApiModelProperty("实收合计") private String realTotal; @ApiModelProperty("车辆总价") private String vehTotalPrice; @ApiModelProperty("名义留购价") private String nominalPrice; + + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + + + @ApiModelProperty("拼接的List") + private List financeForms = new ArrayList<>(); + + + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; + + private String modelSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java new file mode 100644 index 0000000000..140165aa87 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.base.api.basevehicleout; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class BaseSolutionListVo implements Vo { + private static final long serialVersionUID = -8839895532609865401L; + + @ApiModelProperty(value = "内容") + private String value; + + @ApiModelProperty(value = "单元格大小") + private Integer spanSize; + + @ApiModelProperty("类型:0 最普通的 1 标题的 2是 加上划线的") + private Integer type; + @ApiModelProperty("是否加粗，true是，false否") + private boolean bold; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index c8cb5eacc1..9538f36f3f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -105,6 +105,7 @@ public interface BaseVehicleOutFeign { @ApiOperation(("打印交接单")) @PostMapping("/createjrbjdPdf") + @ResponseBody public ResultBean createjrbjdPdf(@RequestParam("sid") String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 1344247218..f4b1ed229f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -71,6 +71,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; @@ -82,6 +83,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; import java.math.BigDecimal; import java.util.*; @@ -146,6 +148,8 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -2164,7 +2168,29 @@ public class BaseVehicleOutService extends MybatisBaseService filesList = new ArrayList<>(); + File xsckdFile = new File(docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + pdfName); + filesList.add(xsckdFile); + //生成销售订单审批 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); + String xsddspUrl = busSalesOrderFeign.createPdf(busSalesOrder.getSid(), "").getData(); + xsddspUrl = xsddspUrl.replace("template/", ""); + File xsddspFile = new File(docPdfComponent.getUploadTemplateUrl() + xsddspUrl); + filesList.add(xsddspFile); + //生成金融报价单 + String cksqSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData(); + if (StringUtils.isNotBlank(cksqSid)) { + String jrbjdUrl = createjrbjdPdfHB(cksqSid, baseVehicleOut1.getVinSid()); + File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl); + filesList.add(jrbjdFile); + } + String hbName = "销售出库单_金融报价单_销售订单审批" + ".pdf"; + try { + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + hbName); + } catch (Exception e) { + e.printStackTrace(); + } + pdfPath.setPdfPath("/template/" + dateStr + "/" + hbName); return pdfPath; } @@ -2280,7 +2306,7 @@ public class BaseVehicleOutService extends MybatisBaseService dataMap = new HashMap(); + //查询出库申请 + BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData(); + //查询出库申请车辆表 + List busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(busDeliveredApply.getSid()).getData(); + //销售订单 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busDeliveredApply.getContractNo()).getData(); + List filesList = new ArrayList<>(); + for (int i = 0; i < busDeliveredApplyDetails.size(); i++) { + Map dataMap = new HashMap<>(); + dataMap.put("saleDeptName", baseQuotationVo.getSaleDeptName()); + dataMap.put("staffName", baseQuotationVo.getStaffName()); + dataMap.put("loanContractNo", baseQuotationVo.getLoanContractNo()); + //客户信息 + dataMap.put("loanBorrName", baseQuotationVo.getLoanBorrName()); + dataMap.put("vinNo", busDeliveredApplyDetails.get(i).getVinNo()); + dataMap.put("mobile", baseQuotationVo.getMobile()); + dataMap.put("address", baseQuotationVo.getAddress()); + dataMap.put("affiliatedCompany", baseQuotationVo.getAffiliatedCompany()); + //车型及价格 + dataMap.put("modelName", baseQuotationVo.getModelName()); + //查询挂车信息 + List baseTrailerVos = baseTrailerService.fetchAllByVehSid(busDeliveredApplyDetails.get(i).getVinSid()); + if (baseTrailerVos.size() == 1) { + BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0); + dataMap.put("gcOneModel", baseTrailerVo.getTrailerModel()); + dataMap.put("gcOnePurUnit", ""); + } else if (baseTrailerVos.size() > 1) { + BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0); + dataMap.put("gcOneModel", baseTrailerVo1.getTrailerModel()); + dataMap.put("gcOnePurUnit", ""); + + BaseTrailerVo baseTrailerVo2 = baseTrailerVos.get(1); + dataMap.put("gcTwoModel", baseTrailerVo2.getTrailerModel()); + dataMap.put("gcTwoPurUnit", ""); + } + //查询上装信息 + BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(busDeliveredApplyDetails.get(0).getVinNo(), busDeliveredApply.getUseOrgSid()); + if (baseVehinstallDetailsVo != null) { + BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupFeign.selectTop(baseVehinstallDetailsVo.getSid(), busSalesOrder.getSid()).getData(); + if (busSalesOrderMakeup != null) { + dataMap.put("szOneName", busSalesOrderMakeup.getTopName()); + dataMap.put("szOnePurUnit", busSalesOrderMakeup.getRefitFactory()); + } + } + dataMap.put("szTwoName", ""); + dataMap.put("szTwoPurUnit", ""); + dataMap.put("remarks", baseQuotationVo.getRemarks()); + //金融方案 + if ("1".equals(baseJRFAVo.getIsPack())) { + dataMap.put("isPack", "是"); + } else { + dataMap.put("isPack", "否"); + } + dataMap.put("policyName", baseJRFAVo.getPolicyName()); + dataMap.put("financProject", baseJRFAVo.getFinancProject()); + dataMap.put("loanTotal", baseJRFAVo.getLoanTotal()); + dataMap.put("sfbl", baseJRFAVo.getDownPayRatio()); + dataMap.put("sfje", baseJRFAVo.getDownPayAmount()); + dataMap.put("cpdkje", baseJRFAVo.getLoanAmount()); + dataMap.put("cpqs", baseJRFAVo.getLoanPeriod()); + dataMap.put("dkbzjbl", baseJRFAVo.getBondRatio()); + dataMap.put("dkbzj", baseJRFAVo.getBondAmount()); + dataMap.put("cjtx", baseJRFAVo.getFactoryDiscount()); + dataMap.put("txyt", baseJRFAVo.getFactoryDiscountUse()); + dataMap.put("nll", baseJRFAVo.getPolicyYearRatio()); + dataMap.put("yhje", baseJRFAVo.getLoanPayMoney()); + dataMap.put("lxze", baseJRFAVo.getLoanInterest()); + dataMap.put("txdck", baseJRFAVo.getDiscountCar()); + //其他融 + dataMap.put("otherPolicyState", baseJRFAVo.isOtherPolicyState()); + dataMap.put("otherPolicyName", baseJRFAVo.getOtherPolicyName()); + dataMap.put("qtrdkje", baseJRFAVo.getOtherPolicyAmount()); + dataMap.put("qtrqs", baseJRFAVo.getOtherPolicyPeriod()); + dataMap.put("qtrnll", baseJRFAVo.getOtherPolicyYearRatio()); + dataMap.put("qtryhje", baseJRFAVo.getOtherPolicyMonthlyRepay()); + dataMap.put("otherPolicyInterest", baseJRFAVo.getOtherPolicyInterest()); + //方案汇总 + dataMap.put("loanDownPay", baseJRFAVo.getLoanDownPay()); + dataMap.put("downPayAmountsRatio", baseJRFAVo.getDownPayAmountsRatio()); + dataMap.put("loanAmountTotal", baseJRFAVo.getLoanAmountTotal()); + dataMap.put("period", baseJRFAVo.getPeriod()); + dataMap.put("monthlyRepay", baseJRFAVo.getMonthlyRepay()); + dataMap.put("interest", baseJRFAVo.getInterest()); + dataMap.put("returnTime", baseJRFAVo.getReturnTime()); + //应收明细 + dataMap.put("downPayAmounts", baseJRFAVo.getDownPayAmounts()); + dataMap.put("bondAmounts", baseJRFAVo.getBondAmounts()); + dataMap.put("depositPremium", baseJRFAVo.getDepositPremium()); + dataMap.put("depositSettle", baseJRFAVo.getDepositSettle()); + dataMap.put("serviceAmount", baseJRFAVo.getServiceAmount()); + dataMap.put("proxyAccidentPremium", baseJRFAVo.getProxyAccidentPremium()); + dataMap.put("registerAmount", baseJRFAVo.getRegisterAmount()); + dataMap.put("operationAmount", baseJRFAVo.getOperationAmount()); + dataMap.put("vehOtherPrice", baseJRFAVo.getVehOtherPrice()); + dataMap.put("otherAmount", baseJRFAVo.getOtherAmount()); + dataMap.put("otherAmountRemark", baseJRFAVo.getOtherAmountRemark()); + dataMap.put("dealWay", baseJRFAVo.getDealWay()); + dataMap.put("proxyTotal", baseJRFAVo.getProxyTotal()); + dataMap.put("proxyPremium", baseJRFAVo.getProxyPremium()); + dataMap.put("proxyPurchasetax", baseJRFAVo.getProxyPurchasetax()); + dataMap.put("receivableTotal", baseJRFAVo.getReceivableTotal()); + dataMap.put("offsetTotal", baseJRFAVo.getOffsetTotal()); + dataMap.put("offsetPremium", baseJRFAVo.getOffsetPremium()); + dataMap.put("offsetPurchasetax", baseJRFAVo.getOffsetPurchasetax()); + dataMap.put("realTotal", baseJRFAVo.getRealTotal()); + dataMap.put("vehTotalPrice", baseJRFAVo.getVehTotalPrice()); + dataMap.put("nominalPrice", baseJRFAVo.getNominalPrice()); + //获取模板 + //模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + //生成文件路径 + String targetPath = sourcePath + dateStr; + WordUtils.creatWord(dataMap, "jrbjd", sourcePath, targetPath, typeName); + //新生成的word路径 + String wordPath = targetPath + "\\" + typeName; + //生成出门证文件名 + String pdfName = "金融报价单_" + dateStr + seconds + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); + File file = new File(docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + pdfName); + filesList.add(file); + } + String typeName = "金融报价单_" + busDeliveredApply.getContractNo() + ".pdf"; + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + try { + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + typeName); + } catch (Exception e) { + e.printStackTrace(); + } + pdfPath.setPdfPath("/template/" + dateStr + "/" + typeName); + return pdfPath; + } + + public String createjrbjdPdfHB(String sid, String vehSid) { + BaseQuotationVo baseQuotationVo = selectQuotation(sid).getData(); + BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo(); + //查询车辆信息 + BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid); + //查询出库申请 + BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData(); + //销售订单 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busDeliveredApply.getContractNo()).getData(); + Map dataMap = new HashMap<>(); dataMap.put("saleDeptName", baseQuotationVo.getSaleDeptName()); dataMap.put("staffName", baseQuotationVo.getStaffName()); dataMap.put("loanContractNo", baseQuotationVo.getLoanContractNo()); //客户信息 dataMap.put("loanBorrName", baseQuotationVo.getLoanBorrName()); - dataMap.put("vinNo", baseQuotationVo.getVinNo()); + dataMap.put("vinNo", baseVehicle.getVinNo()); dataMap.put("mobile", baseQuotationVo.getMobile()); dataMap.put("address", baseQuotationVo.getAddress()); dataMap.put("affiliatedCompany", baseQuotationVo.getAffiliatedCompany()); //车型及价格 dataMap.put("modelName", baseQuotationVo.getModelName()); - dataMap.put("gcOneModel", baseQuotationVo.getGcOneModel()); - dataMap.put("gcOnePurUnit", baseQuotationVo.getGcOnePurUnit()); - dataMap.put("gcTwoModel", baseQuotationVo.getGcTwoModel()); - dataMap.put("gcTwoPurUnit", baseQuotationVo.getGcTwoPurUnit()); - dataMap.put("szOneName", baseQuotationVo.getSzOneName()); - dataMap.put("szOnePurUnit", baseQuotationVo.getSzOnePurUnit()); - dataMap.put("szTwoName", baseQuotationVo.getSzTwoName()); - dataMap.put("szTwoPurUnit", baseQuotationVo.getSzTwoPurUnit()); + //查询挂车信息 + List baseTrailerVos = baseTrailerService.fetchAllByVehSid(vehSid); + if (baseTrailerVos.size() == 1) { + BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0); + dataMap.put("gcOneModel", baseTrailerVo.getTrailerModel()); + dataMap.put("gcOnePurUnit", ""); + } else if (baseTrailerVos.size() > 1) { + BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0); + dataMap.put("gcOneModel", baseTrailerVo1.getTrailerModel()); + dataMap.put("gcOnePurUnit", ""); + + BaseTrailerVo baseTrailerVo2 = baseTrailerVos.get(1); + dataMap.put("gcTwoModel", baseTrailerVo2.getTrailerModel()); + dataMap.put("gcTwoPurUnit", ""); + } + //查询上装信息 + BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicle.getVinNo(), busDeliveredApply.getUseOrgSid()); + if (baseVehinstallDetailsVo != null) { + BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupFeign.selectTop(baseVehinstallDetailsVo.getSid(), busSalesOrder.getSid()).getData(); + if (busSalesOrderMakeup != null) { + dataMap.put("szOneName", busSalesOrderMakeup.getTopName()); + dataMap.put("szOnePurUnit", busSalesOrderMakeup.getRefitFactory()); + } + } + dataMap.put("szTwoName", ""); + dataMap.put("szTwoPurUnit", ""); dataMap.put("remarks", baseQuotationVo.getRemarks()); //金融方案 - dataMap.put("isPack", baseJRFAVo.getIsPack()); + if ("1".equals(baseJRFAVo.getIsPack())) { + dataMap.put("isPack", "是"); + } else { + dataMap.put("isPack", "否"); + } dataMap.put("policyName", baseJRFAVo.getPolicyName()); dataMap.put("financProject", baseJRFAVo.getFinancProject()); dataMap.put("loanTotal", baseJRFAVo.getLoanTotal()); @@ -2460,7 +2653,6 @@ public class BaseVehicleOutService extends MybatisBaseService> selectByApplySid(@RequestParam("sid") String sid); + + @ApiOperation("查询出库申请单sid") + @PostMapping("/fetchByVehSid") + @ResponseBody + ResultBean fetchByVehSid(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java index 6b649a50a9..1c8e14f664 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java @@ -74,4 +74,9 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD public ResultBean> selectByApplySid(String sid) { return null; } + + @Override + public ResultBean fetchByVehSid(String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java index 4892e3e16b..cb3b356d92 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java @@ -59,7 +59,7 @@ public class BusSalesOrderLoancontract extends BaseEntity { @ApiModelProperty("台数") private Integer vehCount; // 台数 @ApiModelProperty("消贷合同编号") - private String loanCotractNo; // 消贷合同编号 + private String loanContractNo; // 消贷合同编号 @ApiModelProperty("资方合同号") private String bankContractNo; // 资方合同号 @ApiModelProperty("资方名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java index 0591c8bde1..5d3f18208e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java @@ -55,4 +55,8 @@ public interface BusTransferRecordsFeign { @ApiOperation("移交记录确认") @PostMapping("/confirmRecords") ResultBean confirmRecords(@RequestBody ConfirmRecordsQuery query); + + @ApiOperation("查看车辆发票记录") + @GetMapping("/selectByVinSidAndKey") + ResultBean selectByVinSidAndKey(@RequestParam("vinSid") String vinSid,@RequestParam("goodsTypeKey") String goodsTypeKey); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java index 1804a7ff9a..fd02fb0d04 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java @@ -94,4 +94,6 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper selectByApplySid(String outboundSid); List selectVinSidByApplySid(String sid); + + String fetchByVehSid(String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml index a280872595..baee829351 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml @@ -75,4 +75,13 @@ left join bus_sales_order bo on bo.sid = bv.salesOrderSid where bd.applySid = #{sid} and bo.contractNo = ba.contractNo + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java index 10ee4121b9..921fc411dc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java @@ -97,4 +97,9 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei List busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(sid); return rb.success().setData(busDeliveredApplyDetails); } + + @Override + public ResultBean fetchByVehSid(String vinSid) { + return busDeliveredApplyDetailsService.fetchByVehSid(vinSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index 29f12867dc..f7e7c48c20 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -46,9 +46,11 @@ import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessage import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import org.apache.poi.util.StringUtil; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -214,4 +216,10 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService selectVinSidByApplySid(String sid) { return baseMapper.selectVinSidByApplySid(sid); } + + public ResultBean fetchByVehSid(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + String cksqSid = baseMapper.fetchByVehSid(vinSid); + return rb.success().setData(cksqSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 865253643a..945c42648b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6541,7 +6541,7 @@ public class BusSalesOrderService extends MybatisBaseService flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData(); List busSalesOrderSourceLCVos = new ArrayList<>(); - for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + /*for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { if (flowTask.getFlowableRecordVo() != null) { Map flowableRecordVo = flowTask.getFlowableRecordVo(); BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); @@ -6567,8 +6567,8 @@ public class BusSalesOrderService extends MybatisBaseService messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); + }*/ + /*List messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); if (messages.size() > 0) { for (Message message : messages) { BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); @@ -6585,7 +6585,7 @@ public class BusSalesOrderService extends MybatisBaseService @Select("select * from bus_transfer_records where sid = #{sid}") BusRecordsInvoiceHgzVo getInvoiceInfoHgz(String sid); + + BusTransferRecords selectByVinSidAndKey(@Param("vinSid") String vinSid,@Param("goodsTypeKey") String goodsTypeKey); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml index 13bacaa17d..046a64134e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml @@ -48,4 +48,12 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java index 795956e099..2a23052f0b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java @@ -65,4 +65,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign { public ResultBean confirmRecords(ConfirmRecordsQuery query) { return busTransferRecordsService.confirmRecords(query); } + + @Override + public ResultBean selectByVinSidAndKey(String vinSid, String goodsTypeKey) { + return busTransferRecordsService.selectByVinSidAndKey(vinSid,goodsTypeKey); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 6a4b49c7db..4ccee7797b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -340,4 +340,10 @@ public class BusTransferRecordsService extends MybatisBaseService selectByVinSidAndKey(String vinSid, String goodsTypeKey) { + ResultBean rb = ResultBean.fireFail(); + BusTransferRecords BusTransferRecords = baseMapper.selectByVinSidAndKey(vinSid, goodsTypeKey); + return rb.success().setData(BusTransferRecords); + } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js index 479bfe1321..b86e8ea588 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js @@ -186,6 +186,24 @@ export function deliveredFinSelecByBusVinSidPC(data) { }) } +// 查看金融报价单 +export function selectQuotation(data) { + return request({ + url: '/base/v1/basevehicleout/selectQuotation', + method: 'post', + params: data + }) +} + +// 下载金融报价单 +export function createjrbjdPdf(data) { + return request({ + url: '/base/v1/basevehicleout/createjrbjdPdf', + method: 'post', + params: data + }) +} + // 保存和修改接口 已改 export function saveOrUpdate(data) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue index 94d3d0ee19..0924ac1435 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue @@ -435,7 +435,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -560,7 +560,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue index ee49f09de8..2c8dba40a3 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue @@ -63,7 +63,8 @@ @@ -107,8 +108,13 @@ + + + + + @@ -124,6 +130,7 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import chukushenqingAdd from './chukushenqingAdd' import chukushenqingInfo from './chukushenqingInfo' +import financialquotationsheet from './relation/financialquotationsheet' export default { name: 'chukushenqing', @@ -132,7 +139,8 @@ export default { Pagination, pageye, chukushenqingAdd, - chukushenqingInfo + chukushenqingInfo, + financialquotationsheet }, data() { return { @@ -379,6 +387,10 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row.sid) }, + lookQuotation(row) { + this.viewState = 5 + this.$refs['divJRBJD'].showInfo(row) + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue new file mode 100644 index 0000000000..794230f04b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue @@ -0,0 +1,372 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue index ff1b1b19e9..6a21b9e00c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue @@ -430,7 +430,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -553,7 +553,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue index c7987da9ac..2911d3bff7 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue @@ -395,7 +395,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -520,7 +520,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue index 115a3f8e30..5151d0df24 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue @@ -18,7 +18,7 @@ -
*适用销售部门:
+
适用销售部门:
@@ -553,20 +553,41 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.isOtherProduct) { + if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.periodKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.yearRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) + return + } + } if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } - } else { - this.$message({ showClose: true, type: 'error', message: '适用销售部门不能为空' }) - return + this.formobj.useDeptList = aa } if (this.formobj.vehTypeKeyList.length > 0) { const aa = [] @@ -583,27 +604,6 @@ export default { this.formobj.vehTypeValueList = [] return } - if (this.formobj.isOtherProduct) { - if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) - return - }if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.periodKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.yearRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) - return - } - } this.submitdisabled = true // 保存 req.saveOrUpdate(this.formobj).then((res) => { diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue index 9e1bb9ca21..af3d6c6eab 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue @@ -302,16 +302,18 @@ export default { this.$refs['form_obj'].validate((valid) => { if (valid) { if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } + this.formobj.useDeptList = aa } if (this.formobj.vehTypeKeyList.length > 0) { const aa = [] diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue index 310a7396be..06977b02eb 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue @@ -397,7 +397,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -522,7 +522,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue index 748f2eb2f2..a0bd4e899c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue @@ -64,7 +64,7 @@
身份证正反面
- + @@ -112,7 +112,7 @@
要求附件
- + @@ -120,7 +120,7 @@
查询结果截图
- + @@ -155,7 +155,7 @@
查询结果截图
- + @@ -215,7 +215,7 @@ - + @@ -225,7 +225,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue index f5971ace08..8437bbf5cf 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue @@ -62,7 +62,7 @@
身份证正反面
- + @@ -110,7 +110,7 @@
要求附件
- + @@ -118,7 +118,7 @@
查询结果截图
- + @@ -153,7 +153,7 @@
查询结果截图
- + @@ -213,7 +213,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileDto.java new file mode 100644 index 0000000000..e454ce9150 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileDto.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto
+ * Description: 放款资料审核 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 数据传输对象", description = "放款资料审核 数据传输对象") +public class LoanFileDto implements Dto { + + private String sid; + + @ApiModelProperty("银行卡") + private List yhkImages = new ArrayList<>(); + @ApiModelProperty("购置税发票") + private List gzsfpImages = new ArrayList<>(); + @ApiModelProperty("保险发票") + private List bxfpImages = new ArrayList<>(); + @ApiModelProperty("保单") + private List bdImages = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java index 7ee686bf18..db46ab2dc3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java @@ -63,6 +63,10 @@ public class LoanFileexamineDetailsVo implements Vo { private String staffName; @ApiModelProperty("车架号拼接") private String vinNo; + @ApiModelProperty("合格证图片") + private List hgzImages; + @ApiModelProperty("发票图片") + private List fpImages; @ApiModelProperty("银行卡") private List yhkImages; @ApiModelProperty("购置税发票") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java index a13b6b15c2..56da05fd71 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java @@ -75,4 +75,9 @@ public interface LoanFileexamineFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("移动端上传附件") + @PostMapping("/uploadFile") + @ResponseBody + public ResultBean uploadFile(@RequestBody LoanFileDto loanFileDto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java index 6184b986e1..0d07f8add8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java @@ -69,10 +69,6 @@ public class LoanFileexamineQuery implements Query { private String bankContractNo; @ApiModelProperty("资方状态value") private String bankStateValue; - @ApiModelProperty("电子件状态") - private String dzjState; - @ApiModelProperty("原件状态") - private String yjState; @ApiModelProperty("资料状态") private String zlState; @ApiModelProperty("组织全路径") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java index c900b7a91d..5de63ced3e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java @@ -59,10 +59,6 @@ public class LoanFileexamineVo implements Vo { private String staffName; @ApiModelProperty("资方状态value") private String bankStateValue; - @ApiModelProperty("电子件状态") - private String dzjState; - @ApiModelProperty("原件状态") - private String yjState; @ApiModelProperty("资料状态") private String zlState; @ApiModelProperty("消贷合同编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 5c581f8ca7..94a881d1c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -49,7 +49,7 @@ public interface LoanFinOtherPolicyFeign { @GetMapping("selectList") @ApiOperation("获取产品政策下其他融，或分公司下其他融") - ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid); @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启") @PostMapping("setState") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java index d02d3f81c6..4ae8ef43b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java @@ -69,9 +69,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper map); - @Update("update loan_credit_appeal_apply set ssjg=#{ssjg} where sid=#{creditApplySid}") - void updateSsjgBySid(String ssjg, String creditApplySid); - String selectNum(String billNo); LoanCreditAppealApply selectByApplySid(String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 8aa39528a7..751a2b7285 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -457,7 +457,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); + loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -619,7 +619,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); + loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml index 9edda0eb33..a7b27bddb8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -10,8 +10,7 @@ bo.`orgName`, bo.`staffName`, lf.`bankStateValue`, - IF(lf.`dzjState` = '0', '未齐全', '已齐全'), - IF(lf.`yjState` = '0', '未齐全', '已齐全'), + IF(lf.`zlState` = 0, '未齐全', '已齐全') AS zlState, bl.`loanContractNo`, bl.`vehCount` AS num, bl.`borrowerName`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java index c48fa8f44b..bb0a94286c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loanfileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; /** * Project: anrui-riskcenter(放款资料审核)
@@ -97,4 +92,11 @@ public class LoanFileexamineRest implements LoanFileexamineFeign { LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean uploadFile(LoanFileDto loanFileDto) { + ResultBean rb = ResultBean.fireFail(); + loanFileexamineService.uploadFile(loanFileDto); + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index e6d2109997..72d090bbf1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.riskcenter.biz.loanfileexamine; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; @@ -35,9 +38,12 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; @@ -51,11 +57,6 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -79,324 +80,398 @@ import java.util.List; @Service public class LoanFileexamineService extends MybatisBaseService { - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; - @Autowired - private BusSalesOrderFeign busSalesOrderFeign; - @Autowired - private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; - @Autowired - private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; - @Autowired - private FileUploadComponent fileUploadComponent; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private BaseVehicleAppendixFeign baseVehicleAppendixFeign; + @Autowired + private BaseVehicleCertificateFeign baseVehicleCertificateFeign; + @Autowired + private BusTransferRecordsFeign busTransferRecordsFeign; - public PagerVo listPageVo(PagerQuery pq) { - LoanFileexamineQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bl.busNo",305); - if (StringUtils.isNotBlank(query.getMenuUrl())) { - //======================= - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("bo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getUseOrgName())) { - qw.like("bo.useOrgName", query.getUseOrgName()); - } - if (StringUtils.isNotBlank(query.getSaleDeptName())) { - qw.like("bo.orgName", query.getSaleDeptName()); - } - if (StringUtils.isNotBlank(query.getStaffName())) { - qw.like("bo.staffName", query.getStaffName()); - } - if (StringUtils.isNotBlank(query.getLoanContractNo())) { - qw.like("bl.loanContractNo", query.getLoanContractNo()); - } - if (StringUtils.isNotBlank(query.getLoanPeoName())) { - qw.like("bl.borrowerName", query.getLoanPeoName()); - } - if (StringUtils.isNotBlank(query.getBankName())) { - qw.like("bl.bankName", query.getBankName()); - } - if (StringUtils.isNotBlank(query.getPolicyName())) { - qw.like("bl.policyName", query.getPolicyName()); - } - if (StringUtils.isNotBlank(query.getBankContractNo())) { - qw.like("bl.bankContractNo", query.getBankContractNo()); - } - if (StringUtils.isNotBlank(query.getBankStateValue())) { - qw.like("lf.bankStateValue", query.getBankStateValue()); - } - if (StringUtils.isNotBlank(query.getDzjState())) { - qw.eq("lf.dzjState", query.getDzjState()); - } - if (StringUtils.isNotBlank(query.getYjState())) { - qw.eq("lf.yjState", query.getYjState()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanFileexamineDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + LoanFileexamineQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bl.busNo", 305); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getLoanContractNo())) { + qw.like("bl.loanContractNo", query.getLoanContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bl.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("bl.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bl.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getBankContractNo())) { + qw.like("bl.bankContractNo", query.getBankContractNo()); + } + if (StringUtils.isNotBlank(query.getBankStateValue())) { + qw.like("lf.bankStateValue", query.getBankStateValue()); + } + if (StringUtils.isNotBlank(query.getZlState())) { + qw.eq("lf.zlState", query.getZlState()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanFileexamineDto dto) { + String dtoSid = dto.getSid(); + List yhkImages = dto.getYhkImages(); + List gzsfpImages = dto.getGzsfpImages(); + List bxfpImages = dto.getBxfpImages(); + List bdImages = dto.getBdImages(); + List rzhtImages = dto.getRzhtImages(); + List zmfjImages = dto.getZmfjImages(); + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto); + for (String yhkImage : yhkImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String gzsfpImage : gzsfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType()); + if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bxfpImage : bxfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType()); + if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bdImage : bdImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType()); + if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bdImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String rzhtImage : rzhtImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType()); + if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String zmfjImage : zmfjImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType()); + if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + return; + } + this.updateByDto(dto); + loanHomevisitInvestigateFileService.delByMainSid(dtoSid); + for (String yhkImage : yhkImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String gzsfpImage : gzsfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType()); + if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bxfpImage : bxfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType()); + if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bdImage : bdImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType()); + if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bdImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String rzhtImage : rzhtImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType()); + if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String zmfjImage : zmfjImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType()); + if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + } + + public String insertByDto(LoanFileexamineDto dto) { + LoanFileexamine entity = new LoanFileexamine(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(LoanFileexamineDto dto) { String dtoSid = dto.getSid(); - List yhkImages = dto.getYhkImages(); - List gzsfpImages = dto.getGzsfpImages(); - List bxfpImages = dto.getBxfpImages(); - List bdImages = dto.getBdImages(); - List rzhtImages = dto.getRzhtImages(); - List zmfjImages = dto.getZmfjImages(); - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto); - for (String yhkImage : yhkImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); - if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String gzsfpImage : gzsfpImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType()); - if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String bxfpImage : bxfpImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType()); - if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String bdImage : bdImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType()); - if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(bdImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String rzhtImage : rzhtImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType()); - if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String zmfjImage : zmfjImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType()); - if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - return; - } - this.updateByDto(dto); - loanHomevisitInvestigateFileService.delByMainSid(dtoSid); - for (String yhkImage : yhkImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); - if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String gzsfpImage : gzsfpImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType()); - if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String bxfpImage : bxfpImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType()); - if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String bdImage : bdImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType()); - if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(bdImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String rzhtImage : rzhtImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType()); - if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - for (String zmfjImage : zmfjImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType()); - if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - } - - public String insertByDto(LoanFileexamineDto dto){ - LoanFileexamine entity = new LoanFileexamine(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(LoanFileexamineDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanFileexamine entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){ - LoanFileexamine entity = fetchBySid(sid); - LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo(); - BeanUtil.copyProperties(entity, vo); - BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData(); - vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); - vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName()); - vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount()); - BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData(); - vo.setStaffName(busSalesOrder.getStaffName()); - List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); - String vinNos = ""; - for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { - vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; - } - vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(","))); - //银行卡 - List yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); - List yhkImages = new ArrayList<>(); - if (yhkVos != null && yhkVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) { - yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setYhkImages(yhkImages); - //购置税发票 - List gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType()); - List gzsfpImages = new ArrayList<>(); - if (gzsfpVos != null && gzsfpVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) { - gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setGzsfpImages(gzsfpImages); - //保险发票 - List bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType()); - List bxfpImages = new ArrayList<>(); - if (bxfpVos != null && bxfpVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) { - bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setBxfpImages(bxfpImages); - //保单 - List bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType()); - List bdImages = new ArrayList<>(); - if (bdVos != null && bdVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) { - bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setBdImages(bdImages); - //融资合同 - List rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType()); - List rzhtImages = new ArrayList<>(); - if (rzhtVos != null && rzhtVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) { - rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setRzhtImages(rzhtImages); - //证明附件 - List zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType()); - List zmfjImages = new ArrayList<>(); - if (zmfjVos != null && zmfjVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) { - zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setZmfjImages(zmfjImages); - return vo; - } + } + LoanFileexamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid) { + LoanFileexamine entity = fetchBySid(sid); + LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo(); + BeanUtil.copyProperties(entity, vo); + BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData(); + vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); + vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData(); + vo.setStaffName(busSalesOrder.getStaffName()); + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); + vo.setNum(busSalesOrderVehicles.size()); + String vinNos = ""; + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; + } + vo.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); + List hgzImages = new ArrayList<>(); + List fpImages = new ArrayList<>(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData(); + //合格证 + List stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + for (String s : stringList) { + hgzImages.add(s); + } + BusTransferRecords busTransferRecords = busTransferRecordsFeign.selectByVinSidAndKey(busSalesOrderVehicle.getLinkSid(), "01").getData(); + String transferFiles = busTransferRecords.getTransferFiles(); + if (StringUtils.isNotBlank(transferFiles)){ + String[] split = transferFiles.split(","); + for (String s : split) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + s = urlPrefix + s; + fpImages.add(s); + } + } + } + vo.setHgzImages(hgzImages); + vo.setFpImages(fpImages); + //银行卡 + List yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImages = new ArrayList<>(); + if (yhkVos != null && yhkVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) { + yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setYhkImages(yhkImages); + //购置税发票 + List gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType()); + List gzsfpImages = new ArrayList<>(); + if (gzsfpVos != null && gzsfpVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) { + gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setGzsfpImages(gzsfpImages); + //保险发票 + List bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType()); + List bxfpImages = new ArrayList<>(); + if (bxfpVos != null && bxfpVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) { + bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setBxfpImages(bxfpImages); + //保单 + List bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType()); + List bdImages = new ArrayList<>(); + if (bdVos != null && bdVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) { + bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setBdImages(bdImages); + //融资合同 + List rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType()); + List rzhtImages = new ArrayList<>(); + if (rzhtVos != null && rzhtVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) { + rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setRzhtImages(rzhtImages); + //证明附件 + List zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType()); + List zmfjImages = new ArrayList<>(); + if (zmfjVos != null && zmfjVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) { + zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setZmfjImages(zmfjImages); + return vo; + } + + public void uploadFile(LoanFileDto loanFileDto) { + String sid = loanFileDto.getSid(); + List yhkImages = loanFileDto.getYhkImages(); + List gzsfpImages = loanFileDto.getGzsfpImages(); + List bxfpImages = loanFileDto.getBxfpImages(); + List bdImages = loanFileDto.getBdImages(); + loanHomevisitInvestigateFileService.delByMainSid(sid); + for (String yhkImage : yhkImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String gzsfpImage : gzsfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType()); + if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bxfpImage : bxfpImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType()); + if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + for (String bdImage : bdImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType()); + if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bdImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 0f14c35cb0..e4f0e84a3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -30,7 +30,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper List selectListOne(@Param("sid") String sid,@Param("name") String name); - List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param("type") String type,@Param("deptSid") String deptSid); IPage selectPageVo(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index ad6da1fc69..e971a0485d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -36,23 +36,56 @@