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 new file mode 100644 index 0000000000..d3c547e83e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java @@ -0,0 +1,120 @@ +package com.yxt.anrui.base.api.basevehicleout; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BaseJRFAVo { + + //金融方案 + @ApiModelProperty("是否打包") + private String isPack; + @ApiModelProperty("产品政策") + private String policyName; + @ApiModelProperty("融资项目") + private String financProject; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("首付比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + private String downPayAmount; + @ApiModelProperty("产品贷款金额") + private String loanAmount; + @ApiModelProperty("产品期数") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金") + private String bondAmount; + @ApiModelProperty("厂家贴息") + private String factoryDiscount; + @ApiModelProperty("贴息用途") + private String factoryDiscountUse; + @ApiModelProperty("年利率(%)") + private String policyYearRatio; + @ApiModelProperty("月还金额") + private String loanPayMoney; + @ApiModelProperty("利息总额") + private String loanInterest; + @ApiModelProperty("贴息抵车款") + private String discountCar; + + //其他融 + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + //方案汇总 + @ApiModelProperty("融资首付") + private String loanDownPay; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + //应收明细 + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @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 realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java index 5cf77dc145..174ba6027d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java @@ -51,106 +51,5 @@ public class BaseQuotationVo implements Vo { @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("是否打包") - private String isPack; - @ApiModelProperty("产品政策") - private String policyName; - @ApiModelProperty("融资项目") - private String financProject; - @ApiModelProperty("融资项目总额") - private String loanTotal; - @ApiModelProperty("首付比例") - private String downPayRatio; - @ApiModelProperty("首付金额") - private String downPayAmount; - @ApiModelProperty("产品贷款金额") - private String loanAmount; - @ApiModelProperty("产品期数") - private String loanPeriod; - @ApiModelProperty("贷款保证金比例") - private String bondRatio; - @ApiModelProperty("贷款保证金") - private String bondAmount; - @ApiModelProperty("厂家贴息") - private String factoryDiscount; - @ApiModelProperty("贴息用途") - private String factoryDiscountUse; - @ApiModelProperty("年利率(%)") - private String policyYearRatio; - @ApiModelProperty("月还金额") - private String loanPayMoney; - @ApiModelProperty("利息总额") - private String loanInterest; - @ApiModelProperty("贴息抵车款") - private String discountCar; - @ApiModelProperty("其它融名称") - private String otherPolicyName; - @ApiModelProperty("贷款金额") - private String loanAmountTotal; - @ApiModelProperty("期数") - private String period; - @ApiModelProperty("年利率(%)") - private String otherPolicyYearRatio; - @ApiModelProperty("月还金额") - private String monthlyRepay; - @ApiModelProperty("利息总额") - private String interest; - @ApiModelProperty("融资首付") - private String loanDownPay; - @ApiModelProperty("实际首付比例") - private String downPayAmountsRatio; - @ApiModelProperty("总贷款金额") - private String hzLoanAmountTotal; - @ApiModelProperty("期数") - private String hzPeriod; - @ApiModelProperty("月还金额") - private String hzMonthlyRepay; - @ApiModelProperty("利息总额") - private String hzInterest; - @ApiModelProperty("预计首期还款日") - private String returnTime; - @ApiModelProperty("融资首付") - private String mxLoanDownPay; - @ApiModelProperty("贷款保证金") - private String mxBondAmount; - @ApiModelProperty("保险保证金") - private String depositPremium; - @ApiModelProperty("落户保证金") - private String depositSettle; - @ApiModelProperty("服务费") - private String serviceAmount; - @ApiModelProperty("代收意外险") - private String proxyAccidentPremium; - @ApiModelProperty("上牌费") - private String licenseFfe; - @ApiModelProperty("运管费") - private String operationAmount; - @ApiModelProperty("补车价") - private String vehOtherPrice; - @ApiModelProperty("其它费用") - private String otherAmount; - @ApiModelProperty("其它费用说明") - private String otherAmountRemark; - @ApiModelProperty("办理方式选择") - private String dealWay; - @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 realTotal; - @ApiModelProperty("车辆总价") - private String vehTotalPrice; - @ApiModelProperty("名义(留购)价") - private String nominalPrice; + private BaseJRFAVo baseJRFAVo; } 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 45915edf8e..c8cb5eacc1 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 @@ -102,6 +102,10 @@ public interface BaseVehicleOutFeign { @PostMapping("/selectQuotation") @ResponseBody public ResultBean selectQuotation(@RequestParam("sid") String sid); + + @ApiOperation(("打印交接单")) + @PostMapping("/createjrbjdPdf") + public ResultBean createjrbjdPdf(@RequestParam("sid") String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 2ae92f3071..15cd437c1a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -139,4 +139,11 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { public ResultBean selectQuotation(String sid) { return baseVehicleOutService.selectQuotation(sid); } + + @Override + public ResultBean createjrbjdPdf(String sid) { + ResultBean rb = ResultBean.fireFail(); + PdfPath pdf = baseVehicleOutService.createjrbjdPdf(sid); + return rb.success().setData(pdf); + } } 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 b7924d472d..1344247218 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 @@ -35,6 +35,8 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo; @@ -68,6 +70,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; 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.service.MybatisBaseService; import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; @@ -128,6 +131,8 @@ public class BaseVehicleOutService extends MybatisBaseService 0){ + if (gcOrSzDtosDK.size() > 0) { SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz); finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); j = j + 1; @@ -2268,12 +2273,12 @@ public class BaseVehicleOutService extends MybatisBaseService selectQuotation(String sid) { ResultBean rb = ResultBean.fireFail(); BaseQuotationVo baseQuotationVo = new BaseQuotationVo(); - //查询出库子表 - BaseVehicleOut baseVehicleOut = fetchBySid(sid); - //查询出库主表 - BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOut.getMainSid()); + //查询出库申请 + BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData(); + //查询出库申请车辆表 + List busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(busDeliveredApply.getSid()).getData(); //根据合同号和车辆sid查询销售订单车辆信息 - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicleOut.getVinSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.get(0).getVinSid()).getData(); //查询销售订单信息 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busSalesOrderVehicle.getSalesOrderSid()).getData(); //销售部门 @@ -2287,7 +2292,7 @@ public class BaseVehicleOutService extends MybatisBaseService baseTrailerVos = baseTrailerService.fetchAllByVehSid(baseVehicleOut.getVinSid()); - if (baseTrailerVos.size() == 1){ + List baseTrailerVos = baseTrailerService.fetchAllByVehSid(busDeliveredApplyDetails.get(0).getVinSid()); + if (baseTrailerVos.size() == 1) { BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0); //挂车车型 baseQuotationVo.setGcOneModel(baseTrailerVo.getTrailerModel()); //采购单位 TODO - }else if (baseTrailerVos.size() > 1){ + } else if (baseTrailerVos.size() > 1) { BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0); //挂车车型 baseQuotationVo.setGcOneModel(baseTrailerVo1.getTrailerModel()); @@ -2320,16 +2325,142 @@ public class BaseVehicleOutService extends MybatisBaseService 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("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()); + dataMap.put("remarks", baseQuotationVo.getRemarks()); + //金融方案 + dataMap.put("isPack", baseJRFAVo.getIsPack()); + 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, ""); + pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); + return pdfPath; } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index a3eded52f1..57d54b621f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -130,6 +130,11 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query); + @ApiOperation("查询一条") + @PostMapping("/fetchBySid") + @ResponseBody + ResultBean fetchBySid(@RequestParam("sid") String sid); + /* @ApiOperation("验证是否可出库") @PostMapping("/checkingApply") // @ResponseBody @@ -226,4 +231,5 @@ public interface BusDeliveredApplyFeign { @ResponseBody ResultBean deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @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/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 98f9789d33..fe7b749a7d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -86,6 +86,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + /* @Override public ResultBean checkingApply(CheckingApplyQuery query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java index ec54d3db86..7a0a0b9f16 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java @@ -80,4 +80,9 @@ public interface BusDeliveredApplyDetailsFeign { @GetMapping("/getRetrievalCarVin") @ResponseBody public ResultBean> getRetrievalCarVin(@RequestParam("sid") String sid); + + @ApiOperation("查询多条") + @PostMapping("/selectByApplySid") + @ResponseBody + ResultBean> selectByApplySid(@RequestParam("sid") String sid); } \ 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 cdd99b5f0e..6b649a50a9 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 @@ -69,4 +69,9 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD public ResultBean> getRetrievalCarVin(String sid) { return null; } + + @Override + public ResultBean> selectByApplySid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index dfb7c6e763..67e8a1a5c6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -146,6 +146,13 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return vo; } + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusDeliveredApply busDeliveredApply = busDeliveredApplyService.fetchBySid(sid); + return rb.success().setData(busDeliveredApply); + } + /* @Override public ResultBean checkingApply(CheckingApplyQuery query) { return busDeliveredApplyService.checkingApply(query); 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 9b9b972e25..10ee4121b9 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 @@ -90,4 +90,11 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei List list = busDeliveredApplyDetailsService.getRetrievalCarVin(sid); return rb.success().setData(list); } + + @Override + public ResultBean> selectByApplySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(sid); + return rb.success().setData(busDeliveredApplyDetails); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java index e312962181..bbb645bb73 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java @@ -51,12 +51,17 @@ public class LoanFileexamine extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("销售订单sid") - private String saleOrderSid; // 销售订单sid + private String saleOrderSid; @ApiModelProperty("销售订单消贷合同sid") - private String loanContractSid; // 销售订单消贷合同sid - @ApiModelProperty("资方状态") - private String bankState; // 资方状态 - @ApiModelProperty("资料状态") - private String fileState; // 资料状态 - + private String loanContractSid; + @ApiModelProperty("资方状态key") + private String bankStateKey; + @ApiModelProperty("资方状态value") + private String bankStateValue; + @ApiModelProperty("电子件状态") + private String dzjState; + @ApiModelProperty("原件状态") + private String yjState; + @ApiModelProperty("资料状态") + private String zlState; } 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 16d792809c..7ee686bf18 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 @@ -73,8 +73,12 @@ public class LoanFileexamineDetailsVo implements Vo { private List bdImages; @ApiModelProperty("融资合同") private List rzhtImages; - @ApiModelProperty("资方状态") - private String bankState; + @ApiModelProperty("资方状态key") + private String bankStateKey; + @ApiModelProperty("资方状态value") + private String bankStateValue; + @ApiModelProperty("资料状态") + private String zlState; @ApiModelProperty("证明附件") private List zmfjImages; @ApiModelProperty("备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java index 41bd7dd965..c7b4c38c53 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java @@ -32,6 +32,9 @@ 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
@@ -52,12 +55,27 @@ public class LoanFileexamineDto implements Dto { private String sid; // sid @ApiModelProperty("销售订单sid") - private String saleOrderSid; // 销售订单sid + private String saleOrderSid; @ApiModelProperty("销售订单消贷合同sid") - private String loanContractSid; // 销售订单消贷合同sid - @ApiModelProperty("资方状态") - private String bankState; // 资方状态 - @ApiModelProperty("资料状态") - private String fileState; // 资料状态 - + private String loanContractSid; + @ApiModelProperty("资方状态key") + private String bankStateKey; + @ApiModelProperty("资方状态value") + private String bankStateValue; + @ApiModelProperty("资料状态") + private String zlState; + @ApiModelProperty("银行卡") + private List yhkImages = new ArrayList<>(); + @ApiModelProperty("购置税发票") + private List gzsfpImages = new ArrayList<>(); + @ApiModelProperty("保险发票") + private List bxfpImages = new ArrayList<>(); + @ApiModelProperty("保单") + private List bdImages = new ArrayList<>(); + @ApiModelProperty("融资合同") + private List rzhtImages = new ArrayList<>(); + @ApiModelProperty("证明附件") + private List zmfjImages = new ArrayList<>(); + @ApiModelProperty("备注") + private String remarks; } \ 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 221f635e63..6184b986e1 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 @@ -67,10 +67,14 @@ public class LoanFileexamineQuery implements Query { private String policyName; @ApiModelProperty("资方合同号") private String bankContractNo; - @ApiModelProperty("资方状态") - private String bankState; + @ApiModelProperty("资方状态value") + private String bankStateValue; + @ApiModelProperty("电子件状态") + private String dzjState; + @ApiModelProperty("原件状态") + private String yjState; @ApiModelProperty("资料状态") - private String fileState; + private String zlState; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; 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 9b66a7d8d7..c900b7a91d 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 @@ -57,10 +57,14 @@ public class LoanFileexamineVo implements Vo { private String orgName; @ApiModelProperty("销售专员名称") private String staffName; - @ApiModelProperty("资方状态") - private String bankState; + @ApiModelProperty("资方状态value") + private String bankStateValue; + @ApiModelProperty("电子件状态") + private String dzjState; + @ApiModelProperty("原件状态") + private String yjState; @ApiModelProperty("资料状态") - private String fileState; + private String zlState; @ApiModelProperty("消贷合同编号") private String loanContractNo; @ApiModelProperty("台数") 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 36e28d46f4..9edda0eb33 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 @@ -9,8 +9,9 @@ bo.`useOrgName`, bo.`orgName`, bo.`staffName`, - lf.`bankState`, - lf.`fileState`, + lf.`bankStateValue`, + IF(lf.`dzjState` = '0', '未齐全', '已齐全'), + IF(lf.`yjState` = '0', '未齐全', '已齐全'), 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/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index 9db0595f60..e6d2109997 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 @@ -41,8 +41,10 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -87,6 +89,8 @@ public class LoanFileexamineService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanFileexamineQuery query = pq.getParams(); @@ -155,11 +159,14 @@ public class LoanFileexamineService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -169,17 +176,145 @@ public class LoanFileexamineService extends MybatisBaseService 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 void insertByDto(LoanFileexamineDto dto){ + 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){ diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index 8efc961183..fa0b735ae4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -6,7 +6,7 @@