diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 2231bcdab0..9fbf8956bb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -100,6 +100,11 @@ public interface FinCollectionConfirmationFeign { @ResponseBody ResultBean createPdf(@RequestParam("skdSid") String skdSid, @RequestParam("printerType") String printerType); + @ApiOperation("生成金融收款单pdf") + @PostMapping("/createPdfRsk") + @ResponseBody + ResultBean createPdfRsk(@RequestParam("skdSid") String skdSid, @RequestParam("printerType") String printerType); + @ApiOperation("重推收款单") @PostMapping("/ctskd") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 78d926522c..173bf36aa0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -99,6 +99,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf return null; } + @Override + public ResultBean createPdfRsk(String skdSid, String printerType) { + return null; + } + @Override public ResultBean ctskd(String skdSid) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinRskPdfVehVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinRskPdfVehVo.java new file mode 100644 index 0000000000..a5ac9f9749 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinRskPdfVehVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/12 16:14 + */ +@Data +public class FinRskPdfVehVo { + + @ApiModelProperty("序号") + private String id; // 序号 + @ApiModelProperty("贷款人") + private String borrowerName; // 贷款人 + @ApiModelProperty("资方") + private String bankName; // 资方 + @ApiModelProperty("消贷合同号") + private String contractNo; // 消贷合同号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("收款项目") + private String collPro; // 收款项目 + @ApiModelProperty("收款金额") + private String collMoney; // 收款金额 + @ApiModelProperty("收款账号") + private String collNum; // 收款账号 + @ApiModelProperty("期数") + private String period; // 收款账号 +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 0906641b91..cc0ec2a1ba 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -122,6 +122,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF return finCollectionConfirmationService.createPdf(skdSid, printerType); } + @Override + public ResultBean createPdfRsk(String skdSid, String printerType) { + return finCollectionConfirmationService.createPdfRsk(skdSid,printerType); + } + @Override public ResultBean ctskd(String skdSid) { return finCollectionConfirmationService.ctskd(skdSid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 81d811bd26..825366b23a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -110,12 +110,10 @@ import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.HanZiConverterPinYin; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.TransformMoney; -import com.yxt.common.base.utils.WordUtils; +import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -127,6 +125,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; +import java.io.InputStream; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -209,6 +209,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -3180,6 +3183,102 @@ public class FinCollectionConfirmationService extends MybatisBaseService createPdfRsk(String skdSid, String printerType) { + ResultBean rb = ResultBean.fireFail(); + PdfPath pdfPath = new PdfPath(); + //获取收款单信息 + FinCollectionConfirmation finCollectionConfirmationDetailsVo = fetchBySid(skdSid); + //获取车辆入库单车辆信息查询 + List finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedService.fetchByCillSid(finCollectionConfirmationDetailsVo.getSid()); + Map dataMap = new HashMap(); + dataMap.put("collDate", finCollectionConfirmationDetailsVo.getCollectionDate()); + dataMap.put("payee", finCollectionConfirmationDetailsVo.getPayerName()); + dataMap.put("billNo", finCollectionConfirmationDetailsVo.getBillNo()); + dataMap.put("settleType", finCollectionConfirmationDetailsVo.getCollectionTypeValue()); + dataMap.put("remarks", finCollectionConfirmationDetailsVo.getRemarks()); + List finCollectionConfirmationMaterials = new ArrayList<>(); + int id = 0; + //循环获取车辆信息 + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetaileds) { + String planSid = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (finSelectedReceivablesDetailedVo.getReceivablesName().equals("月还")) { + planSid = finSelectedReceivablesDetailedVo.getReceivablesSid(); + } else { + FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(finSelectedReceivablesDetailedVo.getReceivablesSid()); + if (jr != null) { + planSid = jr.getBusSid(); + } + } + LoanRepaymentPlanDetails plan = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData(); + if (null != plan) { + FinRskPdfVehVo r = new FinRskPdfVehVo(); + id = id + 1; + if (StringUtils.isNotBlank(plan.getVinNo())) { + r.setVinNo(plan.getVinNo()); + } + r.setId(String.valueOf(id)); + if (StringUtils.isNotBlank(plan.getBorrowerName())) { + r.setBorrowerName(plan.getBorrowerName()); + } + if (StringUtils.isNotBlank(plan.getBankName())) { + r.setBankName(plan.getBankName()); + } + if (StringUtils.isNotBlank(plan.getLoanContractNo())) { + r.setContractNo(plan.getLoanContractNo()); + } + if (StringUtils.isNotBlank(plan.getPeriod())) { + r.setPeriod(plan.getPeriod()); + } + r.setCollPro(finSelectedReceivablesDetailedVo.getReceivablesName()); + r.setCollMoney(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); + r.setCollNum(finCollectionConfirmationDetailsVo.getCollectionBankNum()); + finCollectionConfirmationMaterials.add(r); + } + } + dataMap.put("wlList", finCollectionConfirmationMaterials); + dataMap.put("zcollMoney", finCollectionConfirmationDetailsVo.getCollectionMoney().toString()); + String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString()); + dataMap.put("tPriceDX", tPriceDX); + dataMap.put("makeName", finCollectionConfirmationDetailsVo.getCreateByName() + DateUtil.formatDate(new Date())); + dataMap.put("confirmName", finCollectionConfirmationDetailsVo.getConfirmName() + finCollectionConfirmationDetailsVo.getConfirmDate()); + String temp = "/template/"; + String targetPath = docPdfComponent.getUploadTemplateUrl(); + try { + //获取模板 + String streamPath = ""; + if (printerType.equals("针孔式打印机")) { + streamPath = "ftl/rskzhenshi.ftl"; + } else if (printerType.equals("激光打印机")) { + streamPath = "ftl/rskjiguang.ftl"; + } + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(streamPath); + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "templateVouchers" + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + String pdfName = "收款单_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + pdfPath.setPdfPath(temp + pdfName); + } catch (NoClassDefFoundError e) { + e.printStackTrace(); + } + String downNum = finCollectionConfirmationDetailsVo.getDownNum(); + if (StringUtils.isBlank(downNum)) { + downNum = "1"; + } else { + downNum = String.valueOf((Integer.parseInt(downNum) + 1)); + } + baseMapper.updateDown(skdSid, downNum); + return rb.success().setData(pdfPath); + } + public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { ResultBean rb = ResultBean.fireFail(); int i = baseMapper.updateVin(vinNo, contractNo, temporaryNo); @@ -3935,11 +4034,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService + + + God + FAN + 4 + 2014-10-29T12:08:00Z + 2024-04-12T08:09:19Z + 1 + 43 + 247 + 2 + 1 + 289 + 14 + + + 2052-12.1.0.16388 + 8F987240CBE0478BA1A855C2A52974A2_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${collDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 付款方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${payee!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 结算方式： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${settleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 贷款人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 资方 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 消贷 + + + + + + + + 合同号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款项目 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 期数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款账号 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.id!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.borrowerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.bankName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collPro!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.period!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collNum!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zcollMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核人： + + + + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + PAGE \* MERGEFORMAT + + + + + + 1 + + + + + + 页 共 + + + + + + NUMPAGES \* MERGEFORMAT + + + + + + 1 + + + + + + 页 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/rskzhenshi.ftl b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/rskzhenshi.ftl new file mode 100644 index 0000000000..2dbdf2c76f --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/rskzhenshi.ftl @@ -0,0 +1,3056 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${collDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 付款方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${payee!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 结算方式： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${settleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 贷款人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 资方 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 消贷 + + + + + + + + 合同号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款项目 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 期数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 收款账号 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.id!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.borrowerName!} + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.bankName!} + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collPro!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.period!} + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.collNum!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zcollMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 43 + 247 + 2 + 1 + 0 + false + false + 289 + WPS Office_12.1.0.16388_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2014-10-29T12:08:00Z + God + FAN + 2024-04-12T08:09:45Z + 12 + + + + + + + + 2052-12.1.0.16388 + + + 9F95CA1D0C084A919133A397855EA1D2_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + PAGE \* + MERGEFORMAT + + + + + + 1 + + + + + + 页 共 + + + + + + NUMPAGES \* + MERGEFORMAT + + + + + + 1 + + + + + + 页 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核人： + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java index 6a71d7dd2a..b14736ef13 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java @@ -315,7 +315,7 @@ public class WxSysUserRest implements WxSysUserFeign { wxHomePageVo.setHeadImage(fileUploadComponent.getUrlPrefix() + wxHomePageVo.getHeadImage()); } //2018.08.24-2038.08.24 - String idTerm = wxHomePageVo.getIdTerm(); + /*String idTerm = wxHomePageVo.getIdTerm(); List split = Arrays.asList(idTerm.split("-")); if (split.size() == 2) { String idTermEnd = split.get(1); @@ -325,7 +325,7 @@ public class WxSysUserRest implements WxSysUserFeign { isHave = true; wxHomePageVo.setMessage("您的身份证将在" + days + "天后到期，请及时更新信息"); } - } + }*/ wxHomePageVo.setIsHave(isHave); return new ResultBean().success().setData(wxHomePageVo); } diff --git a/anrui-riskcenter-ui/src/api/agentbusiness/agentbusiness.js b/anrui-riskcenter-ui/src/api/agentbusiness/agentbusiness.js index 3c9a53c977..1bcdbf0822 100644 --- a/anrui-riskcenter-ui/src/api/agentbusiness/agentbusiness.js +++ b/anrui-riskcenter-ui/src/api/agentbusiness/agentbusiness.js @@ -50,6 +50,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + paymentCreatePdf: function(data) { + return request({ + url: '/riskcenter/v1/loantransferpaymentapply/paymentCreatePdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/api/deduct/deduct.js b/anrui-riskcenter-ui/src/api/deduct/deduct.js index 06bf71cb39..a5675fe971 100644 --- a/anrui-riskcenter-ui/src/api/deduct/deduct.js +++ b/anrui-riskcenter-ui/src/api/deduct/deduct.js @@ -40,6 +40,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + buckleCreatePdf: function(data) { + return request({ + url: '/riskcenter/v1/loanbuckleapply/buckleCreatePdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js b/anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js index 3ce3361080..16dfae3ddf 100644 --- a/anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js +++ b/anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js @@ -40,6 +40,13 @@ export default { params: data }) }, + accrualCreatePdf: function(data) { + return request({ + url: '/riskcenter/v1/loanmonthlyaccrualapply/accrualCreatePdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/api/repaymentschedule/repaymentschedule.js b/anrui-riskcenter-ui/src/api/repaymentschedule/repaymentschedule.js index 9339e6f054..eb8aae5733 100644 --- a/anrui-riskcenter-ui/src/api/repaymentschedule/repaymentschedule.js +++ b/anrui-riskcenter-ui/src/api/repaymentschedule/repaymentschedule.js @@ -42,5 +42,14 @@ export default { method: 'get', params: data }) + }, + // 下载还款计划表 + createRepaymentVoucher: function(data) { + return request({ + url: '/riskcenter/v1/loanrepaymentschedule/createRepaymentVoucher', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) } } diff --git a/anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue b/anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue index 767e50e1b9..ee945077fd 100644 --- a/anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue +++ b/anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue @@ -4,6 +4,7 @@
{{ viewTitle }}
+ 下载 关闭
@@ -70,6 +71,7 @@