diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 28a6502d73..56e2f5d7ef 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -158,5 +158,13 @@ public interface BusArrearsCarryVehicleApplyFeign { @ResponseBody public ResultBean breakProcess(@Valid @RequestBody AppAdvanceArrearsTaskQuery query); + @ApiOperation(value = "欠款提车已走完的流程生成附件") + @GetMapping(value = "/createPdfFile") + @ResponseBody + ResultBean createPdfFile(@RequestParam("sid")String sid); + + + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 9d13d2ccd3..7978b0ecf4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -156,4 +156,9 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) { return null; } + + @Override + public ResultBean createPdfFile(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/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 984a5a1d34..cd556364c5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -248,5 +248,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.breakProcess(query); } + @Override + public ResultBean createPdfFile(String sid) { + return busArrearsCarryVehicleApplyService.createPdfFile(sid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 54fa1f06c6..596fdbc1d6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -796,14 +796,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService filesList = new ArrayList<>(); if (StringUtils.isNotBlank(carContractDownloadUrl)) { @@ -891,13 +891,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService guaranteeLetter = query.getGuaranteeLetter(); - if (guaranteeLetter.isEmpty()) { - return rb.setMsg("请上传欠款提车担保承诺书"); - } else { + if (!guaranteeLetter.isEmpty()) { String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages); } @@ -2401,4 +2400,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService createPdfFile(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppArrearsCarryDto dto = new AppArrearsCarryDto(); + //根据sid查询欠款提车数据 + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(sid); + BeanUtil.copyProperties(busArrearsCarryVehicleApply,dto,"sid"); + List adCarListVoList = busArrearsCarryVehicleDetailsService.selectByApplySidVehicle(sid); + dto.setVinList(adCarListVoList); + dto.setContractId(busArrearsCarryVehicleApply.getContractNo()); + CreatePdfVo createPdf = createPdf(dto); + String url = docPdfComponent.getPrefixTemplateUrl()+createPdf.getAllDownloadUrl(); + return rb.success().setData(url); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java index c974ed7344..5e5b52ba9f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import org.apache.ibatis.annotations.Delete; @@ -67,4 +68,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper selectDetailsByApplySid(String sid); List selectByApplySidOne(String sid); + + List selectByApplySidVehicle(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml index 9c458746b6..4720ca4627 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml @@ -37,4 +37,9 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java index 21cc380561..b4f53e0a1a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails; 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.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsQuery; @@ -135,4 +136,8 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService selectByApplySidOne(String sid) { return baseMapper.selectByApplySidOne(sid); } + + public List selectByApplySidVehicle(String sid) { + return baseMapper.selectByApplySidVehicle(sid); + } } \ No newline at end of file